diff --git a/.bazelrc b/.bazelrc
index 54a510f05dc6..679eeec77a32 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -33,10 +33,6 @@ common --@rules_dotnet//dotnet/settings:strict_deps=false
 # we only configure a nightly toolchain
 common --@rules_rust//rust/toolchain/channel=nightly
 
-# rust does not like the gold linker, while bazel does by default, so let's avoid using it
-common:linux --linkopt=-fuse-ld=lld
-common:macos --linkopt=-fuse-ld=lld
-
 # Reduce this eventually to empty, once we've fixed all our usages of java, and https://github.com/bazel-contrib/rules_go/issues/4193 is fixed
 common --incompatible_autoload_externally="+@rules_java,+@rules_shell"
 
diff --git a/.github/workflows/build-ripunzip.yml b/.github/workflows/build-ripunzip.yml
index 3e32b868985d..6f1f95ddf8c6 100644
--- a/.github/workflows/build-ripunzip.yml
+++ b/.github/workflows/build-ripunzip.yml
@@ -20,7 +20,7 @@ jobs:
         os: [ubuntu-22.04, macos-13, windows-2022]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           repository: google/ripunzip
           ref: ${{ inputs.ripunzip-version }}
@@ -28,7 +28,7 @@ jobs:
       # see https://github.com/sfackler/rust-openssl/issues/183
       - if: runner.os == 'Linux'
         name: checkout openssl
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: openssl/openssl
           path: openssl
diff --git a/.github/workflows/buildifier.yml b/.github/workflows/buildifier.yml
index f3fbf97854ce..ac344df588ed 100644
--- a/.github/workflows/buildifier.yml
+++ b/.github/workflows/buildifier.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Check bazel formatting
         uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         with:
diff --git a/.github/workflows/check-implicit-this.yml b/.github/workflows/check-implicit-this.yml
index f58db399ccb9..a109f4bfe55c 100644
--- a/.github/workflows/check-implicit-this.yml
+++ b/.github/workflows/check-implicit-this.yml
@@ -16,7 +16,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check that implicit this warnings is enabled for all packs
         shell: bash
         run: |
diff --git a/.github/workflows/check-overlay-annotations.yml b/.github/workflows/check-overlay-annotations.yml
index 5369dfd49d00..849cad113c40 100644
--- a/.github/workflows/check-overlay-annotations.yml
+++ b/.github/workflows/check-overlay-annotations.yml
@@ -17,7 +17,7 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check overlay annotations
         run: python config/add-overlay-annotations.py --check java
 
diff --git a/.github/workflows/check-qldoc.yml b/.github/workflows/check-qldoc.yml
index f10e0dc90b99..8fe47bf50f76 100644
--- a/.github/workflows/check-qldoc.yml
+++ b/.github/workflows/check-qldoc.yml
@@ -18,7 +18,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 2
 
diff --git a/.github/workflows/check-query-ids.yml b/.github/workflows/check-query-ids.yml
index 8ae19cc3e5f8..14d597d44cbd 100644
--- a/.github/workflows/check-query-ids.yml
+++ b/.github/workflows/check-query-ids.yml
@@ -19,6 +19,6 @@ jobs:
     name: Check query IDs
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check for duplicate query IDs
         run: python3 misc/scripts/check-query-ids.py
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index ba384245e0eb..a32732ab6e6e 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -37,7 +37,7 @@ jobs:
         dotnet-version: 9.0.100
 
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/compile-queries.yml b/.github/workflows/compile-queries.yml
index 945515c0c532..36171543cac4 100644
--- a/.github/workflows/compile-queries.yml
+++ b/.github/workflows/compile-queries.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest-xl
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
         with:
diff --git a/.github/workflows/cpp-swift-analysis.yml b/.github/workflows/cpp-swift-analysis.yml
index 18c2708d7b4f..f72c13cdd708 100644
--- a/.github/workflows/cpp-swift-analysis.yml
+++ b/.github/workflows/cpp-swift-analysis.yml
@@ -28,7 +28,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/csharp-qltest.yml b/.github/workflows/csharp-qltest.yml
index ef0b93c50c81..580861af17bb 100644
--- a/.github/workflows/csharp-qltest.yml
+++ b/.github/workflows/csharp-qltest.yml
@@ -39,7 +39,7 @@ jobs:
         os: [ubuntu-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup dotnet
         uses: actions/setup-dotnet@v4
         with:
@@ -55,7 +55,7 @@ jobs:
   stubgentest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./csharp/actions/create-extractor-pack
       - name: Run stub generator tests
         run: |
diff --git a/.github/workflows/csv-coverage-metrics.yml b/.github/workflows/csv-coverage-metrics.yml
index 08f0e9883efc..c9ec9e602d2b 100644
--- a/.github/workflows/csv-coverage-metrics.yml
+++ b/.github/workflows/csv-coverage-metrics.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Create empty database
@@ -51,7 +51,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Create empty database
diff --git a/.github/workflows/csv-coverage-pr-artifacts.yml b/.github/workflows/csv-coverage-pr-artifacts.yml
index cbd92dd47d75..c62de00535e2 100644
--- a/.github/workflows/csv-coverage-pr-artifacts.yml
+++ b/.github/workflows/csv-coverage-pr-artifacts.yml
@@ -35,11 +35,11 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github.event) }}
         run: echo "$GITHUB_CONTEXT"
       - name: Clone self (github/codeql) - MERGE
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: merge
       - name: Clone self (github/codeql) - BASE
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 2
           path: base
diff --git a/.github/workflows/csv-coverage-pr-comment.yml b/.github/workflows/csv-coverage-pr-comment.yml
index cf01ef063acf..534725815b4b 100644
--- a/.github/workflows/csv-coverage-pr-comment.yml
+++ b/.github/workflows/csv-coverage-pr-comment.yml
@@ -24,7 +24,7 @@ jobs:
         GITHUB_CONTEXT: ${{ toJSON(github.event) }}
       run: echo "$GITHUB_CONTEXT"
     - name: Clone self (github/codeql)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
     - name: Set up Python 3.8
       uses: actions/setup-python@v4
       with:
diff --git a/.github/workflows/csv-coverage-timeseries.yml b/.github/workflows/csv-coverage-timeseries.yml
index 13dc99b162cc..11bc06bee602 100644
--- a/.github/workflows/csv-coverage-timeseries.yml
+++ b/.github/workflows/csv-coverage-timeseries.yml
@@ -12,11 +12,11 @@ jobs:
 
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: script
       - name: Clone self (github/codeql) for analysis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeqlModels
           fetch-depth: 0
diff --git a/.github/workflows/csv-coverage-update.yml b/.github/workflows/csv-coverage-update.yml
index 6b73bff820d2..9f7a0b778dab 100644
--- a/.github/workflows/csv-coverage-update.yml
+++ b/.github/workflows/csv-coverage-update.yml
@@ -21,7 +21,7 @@ jobs:
           GITHUB_CONTEXT: ${{ toJSON(github.event) }}
         run: echo "$GITHUB_CONTEXT"
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: ql
           fetch-depth: 0
diff --git a/.github/workflows/csv-coverage.yml b/.github/workflows/csv-coverage.yml
index 525f4bfb64cf..a1224456410a 100644
--- a/.github/workflows/csv-coverage.yml
+++ b/.github/workflows/csv-coverage.yml
@@ -16,11 +16,11 @@ jobs:
 
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: script
       - name: Clone self (github/codeql) for analysis
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeqlModels
           ref: ${{ github.event.inputs.qlModelShaOverride || github.ref }}
diff --git a/.github/workflows/fast-forward.yml b/.github/workflows/fast-forward.yml
index dd8fefbc529f..d71f8be20f99 100644
--- a/.github/workflows/fast-forward.yml
+++ b/.github/workflows/fast-forward.yml
@@ -26,7 +26,7 @@ jobs:
           exit 1
 
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Git config
         shell: bash
diff --git a/.github/workflows/go-tests.yml b/.github/workflows/go-tests.yml
index c30abdd9e5d7..6578f09b8dfc 100644
--- a/.github/workflows/go-tests.yml
+++ b/.github/workflows/go-tests.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest-xl
     steps:
       - name: Check out code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Run tests
         uses: ./go/actions/test
         with:
diff --git a/.github/workflows/kotlin-build.yml b/.github/workflows/kotlin-build.yml
index 565c3d3a8ba4..71a9f8b525ce 100644
--- a/.github/workflows/kotlin-build.yml
+++ b/.github/workflows/kotlin-build.yml
@@ -20,7 +20,7 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: |
           bazel query //java/kotlin-extractor/...
           # only build the default version as a quick check that we can build from `codeql`
diff --git a/.github/workflows/mad_modelDiff.yml b/.github/workflows/mad_modelDiff.yml
index b0e4a20f2b84..3b96d903e232 100644
--- a/.github/workflows/mad_modelDiff.yml
+++ b/.github/workflows/mad_modelDiff.yml
@@ -28,12 +28,12 @@ jobs:
         slug: ${{fromJson(github.event.inputs.projects || '["apache/commons-codec", "apache/commons-io", "apache/commons-beanutils", "apache/commons-logging", "apache/commons-fileupload", "apache/commons-lang", "apache/commons-validator", "apache/commons-csv", "apache/dubbo"]' )}}
     steps:
       - name: Clone github/codeql from PR
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         if: github.event.pull_request
         with:
           path: codeql-pr
       - name: Clone github/codeql from main
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: codeql-main
           ref: main
diff --git a/.github/workflows/mad_regenerate-models.yml b/.github/workflows/mad_regenerate-models.yml
index 61e4f9862433..402dd9573318 100644
--- a/.github/workflows/mad_regenerate-models.yml
+++ b/.github/workflows/mad_regenerate-models.yml
@@ -30,11 +30,11 @@ jobs:
             ref: "placeholder"
     steps:
       - name: Clone self (github/codeql)
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Setup CodeQL binaries
         uses: ./.github/actions/fetch-codeql
       - name: Clone repositories
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           path: repos/${{ matrix.ref }}
           ref: ${{ matrix.ref }}
diff --git a/.github/workflows/python-tooling.yml b/.github/workflows/python-tooling.yml
index 19059070878f..bab1277dd03d 100644
--- a/.github/workflows/python-tooling.yml
+++ b/.github/workflows/python-tooling.yml
@@ -21,7 +21,7 @@ jobs:
   check-python-tooling:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/setup-python@v5
         with:
           python-version: '3.12'
diff --git a/.github/workflows/qhelp-pr-preview.yml b/.github/workflows/qhelp-pr-preview.yml
index be5a42096bba..a152eb7cc097 100644
--- a/.github/workflows/qhelp-pr-preview.yml
+++ b/.github/workflows/qhelp-pr-preview.yml
@@ -43,7 +43,7 @@ jobs:
           if-no-files-found: error
           retention-days: 1
 
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 2
           persist-credentials: false
diff --git a/.github/workflows/ql-for-ql-build.yml b/.github/workflows/ql-for-ql-build.yml
index 73833da05491..9c568a9b5729 100644
--- a/.github/workflows/ql-for-ql-build.yml
+++ b/.github/workflows/ql-for-ql-build.yml
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest-xl
     steps:
       ### Build the queries ###
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 0
       - name: Find codeql
diff --git a/.github/workflows/ql-for-ql-dataset_measure.yml b/.github/workflows/ql-for-ql-dataset_measure.yml
index c3441ffa4074..b4561c04a965 100644
--- a/.github/workflows/ql-for-ql-dataset_measure.yml
+++ b/.github/workflows/ql-for-ql-dataset_measure.yml
@@ -25,7 +25,7 @@ jobs:
           - github/codeql
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Find codeql
         id: find-codeql
@@ -46,7 +46,7 @@ jobs:
         env:
           CODEQL: ${{ steps.find-codeql.outputs.codeql-path }}
       - name: Checkout ${{ matrix.repo }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ matrix.repo }}
           path: ${{ github.workspace }}/repo
@@ -75,7 +75,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: measure
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           name: measurements
diff --git a/.github/workflows/ql-for-ql-tests.yml b/.github/workflows/ql-for-ql-tests.yml
index 4502dded53f4..fdb9da284cef 100644
--- a/.github/workflows/ql-for-ql-tests.yml
+++ b/.github/workflows/ql-for-ql-tests.yml
@@ -24,7 +24,7 @@ jobs:
   qltest:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Find codeql
         id: find-codeql
         uses: github/codeql-action/init@main
@@ -64,7 +64,7 @@ jobs:
     needs: [qltest]
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install GNU tar
         if: runner.os == 'macOS'
         run: |
diff --git a/.github/workflows/query-list.yml b/.github/workflows/query-list.yml
index a286b9b846bf..a383e381d90f 100644
--- a/.github/workflows/query-list.yml
+++ b/.github/workflows/query-list.yml
@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Clone self (github/codeql)
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         path: codeql 
     - name: Set up Python 3.8
diff --git a/.github/workflows/ruby-build.yml b/.github/workflows/ruby-build.yml
index 343e896151c2..39aadef09138 100644
--- a/.github/workflows/ruby-build.yml
+++ b/.github/workflows/ruby-build.yml
@@ -47,7 +47,7 @@ jobs:
     runs-on: ${{ matrix.os }}
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Install GNU tar
         if: runner.os == 'macOS'
         run: |
@@ -113,7 +113,7 @@ jobs:
     if: github.repository_owner == 'github'
     runs-on: ubuntu-latest-xl
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Fetch CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Cache compilation cache
@@ -146,7 +146,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build, compile-queries]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           name: ruby.dbscheme
@@ -209,7 +209,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: [package]
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Fetch CodeQL
         uses: ./.github/actions/fetch-codeql
 
diff --git a/.github/workflows/ruby-dataset-measure.yml b/.github/workflows/ruby-dataset-measure.yml
index e3229b158063..a88b23bf3a10 100644
--- a/.github/workflows/ruby-dataset-measure.yml
+++ b/.github/workflows/ruby-dataset-measure.yml
@@ -30,14 +30,14 @@ jobs:
         repo: [rails/rails, discourse/discourse, spree/spree, ruby/ruby]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - uses: ./.github/actions/fetch-codeql
 
       - uses: ./ruby/actions/create-extractor-pack
 
       - name: Checkout ${{ matrix.repo }}
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           repository: ${{ matrix.repo }}
           path: ${{ github.workspace }}/repo
@@ -62,7 +62,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: measure
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: actions/download-artifact@v4
         with:
           path: stats
diff --git a/.github/workflows/ruby-qltest-rtjo.yml b/.github/workflows/ruby-qltest-rtjo.yml
index c2ae9c0cef19..1d57c465538e 100644
--- a/.github/workflows/ruby-qltest-rtjo.yml
+++ b/.github/workflows/ruby-qltest-rtjo.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: ./ruby/actions/create-extractor-pack
       - name: Cache compilation cache
diff --git a/.github/workflows/ruby-qltest.yml b/.github/workflows/ruby-qltest.yml
index d1518205dab9..e178a5dfb6e0 100644
--- a/.github/workflows/ruby-qltest.yml
+++ b/.github/workflows/ruby-qltest.yml
@@ -36,7 +36,7 @@ jobs:
   qlupgrade:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - name: Check DB upgrade scripts
         run: |
@@ -58,7 +58,7 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: ./ruby/actions/create-extractor-pack
       - name: Cache compilation cache
diff --git a/.github/workflows/rust-analysis.yml b/.github/workflows/rust-analysis.yml
index 04028ad594bc..397aa2fba512 100644
--- a/.github/workflows/rust-analysis.yml
+++ b/.github/workflows/rust-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
 
     - name: Query latest nightly CodeQL bundle
       shell: bash
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index cc880072555e..34f5efb74ba6 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -30,7 +30,7 @@ jobs:
         working-directory: rust/ast-generator
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Inject sources
         shell: bash
         run: |
@@ -53,7 +53,7 @@ jobs:
         working-directory: rust/extractor
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Format
         shell: bash
         run: |
@@ -69,7 +69,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
       - name: Install CodeQL
         uses: ./.github/actions/fetch-codeql
       - name: Code generation
diff --git a/.github/workflows/swift.yml b/.github/workflows/swift.yml
index df610a967025..4a5613f988e5 100644
--- a/.github/workflows/swift.yml
+++ b/.github/workflows/swift.yml
@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
     runs-on: ${{ matrix.runner }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Setup (Linux)
         if: runner.os == 'Linux'
         run: |
@@ -53,7 +53,7 @@ jobs:
   clang-format:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that python code is properly formatted
         with:
@@ -61,7 +61,7 @@ jobs:
   codegen:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ./.github/actions/fetch-codeql
       - uses: pre-commit/action@646c83fcd040023954eafda54b4db0192ce70507
         name: Check that QL generated code was checked in
@@ -77,6 +77,6 @@ jobs:
   check-no-override:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check that no override is present in load.bzl
         run: bazel test ... --test_tag_filters=override --test_output=errors
diff --git a/.github/workflows/sync-files.yml b/.github/workflows/sync-files.yml
index 1ed49ac3ecf6..f7f42f2e5aff 100644
--- a/.github/workflows/sync-files.yml
+++ b/.github/workflows/sync-files.yml
@@ -17,7 +17,7 @@ jobs:
   sync:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check synchronized files
         run: python config/sync-files.py
       - name: Check dbscheme fragments
diff --git a/.github/workflows/tree-sitter-extractor-test.yml b/.github/workflows/tree-sitter-extractor-test.yml
index 9a71e1fc7c54..da5834a7f9f3 100644
--- a/.github/workflows/tree-sitter-extractor-test.yml
+++ b/.github/workflows/tree-sitter-extractor-test.yml
@@ -30,7 +30,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check formatting
         run: cargo fmt -- --check
       - name: Run tests
@@ -38,12 +38,12 @@ jobs:
   fmt:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Check formatting
         run: cargo fmt --check
   clippy:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Run clippy
         run: cargo clippy -- --no-deps -D warnings -A clippy::new_without_default -A clippy::too_many_arguments
diff --git a/.github/workflows/validate-change-notes.yml b/.github/workflows/validate-change-notes.yml
index 42784b661fcc..6812d8ff0f6d 100644
--- a/.github/workflows/validate-change-notes.yml
+++ b/.github/workflows/validate-change-notes.yml
@@ -23,7 +23,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup CodeQL
         uses: ./.github/actions/fetch-codeql
diff --git a/.github/workflows/zipmerge-test.yml b/.github/workflows/zipmerge-test.yml
index edae93a90a00..1e7ac195b5a7 100644
--- a/.github/workflows/zipmerge-test.yml
+++ b/.github/workflows/zipmerge-test.yml
@@ -18,6 +18,6 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - run: |
           bazel test //misc/bazel/internal/zipmerge:test --test_output=all
diff --git a/Cargo.lock b/Cargo.lock
index 263b16482a98..b712c4f8d24b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -40,9 +40,9 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.18"
+version = "0.6.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
+checksum = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -55,44 +55,44 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.10"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
+checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.6"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.2"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
+checksum = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9"
 dependencies = [
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.7"
+version = "3.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
+checksum = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882"
 dependencies = [
  "anstyle",
- "once_cell",
+ "once_cell_polyfill",
  "windows-sys 0.59.0",
 ]
 
 [[package]]
 name = "anyhow"
-version = "1.0.98"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
+checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
 
 [[package]]
 name = "argfile"
@@ -136,9 +136,9 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "base64"
@@ -160,9 +160,9 @@ checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
 
 [[package]]
 name = "borsh"
-version = "1.5.5"
+version = "1.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
 dependencies = [
  "cfg_aliases",
 ]
@@ -185,9 +185,9 @@ dependencies = [
 
 [[package]]
 name = "bumpalo"
-version = "3.16.0"
+version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "bytemuck"
@@ -195,12 +195,6 @@ version = "1.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ef657dfab802224e671f5818e9a4935f9b1957ed18e58292690cc39e7a4092a3"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "camino"
 version = "1.1.10"
@@ -221,25 +215,25 @@ dependencies = [
 
 [[package]]
 name = "cargo-util-schemas"
-version = "0.2.0"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca"
+checksum = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830"
 dependencies = [
  "semver",
  "serde",
  "serde-untagged",
  "serde-value",
- "thiserror 1.0.69",
- "toml",
+ "thiserror",
+ "toml 0.8.23",
  "unicode-xid",
  "url",
 ]
 
 [[package]]
 name = "cargo_metadata"
-version = "0.20.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502"
+checksum = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868"
 dependencies = [
  "camino",
  "cargo-platform",
@@ -247,14 +241,14 @@ dependencies = [
  "semver",
  "serde",
  "serde_json",
- "thiserror 2.0.12",
+ "thiserror",
 ]
 
 [[package]]
 name = "cc"
-version = "1.2.7"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
 dependencies = [
  "jobserver",
  "libc",
@@ -285,6 +279,18 @@ dependencies = [
  "synstructure",
 ]
 
+[[package]]
+name = "chalk-derive"
+version = "0.104.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
 [[package]]
 name = "chalk-ir"
 version = "0.103.0"
@@ -292,7 +298,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90a37d2ab99352b4caca135061e7b4ac67024b648c28ed0b787feec4bea4caed"
 dependencies = [
  "bitflags 2.9.1",
- "chalk-derive",
+ "chalk-derive 0.103.0",
+]
+
+[[package]]
+name = "chalk-ir"
+version = "0.104.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8"
+dependencies = [
+ "bitflags 2.9.1",
+ "chalk-derive 0.104.0",
 ]
 
 [[package]]
@@ -301,8 +317,8 @@ version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c855be60e646664bc37c2496d3dc81ca5ef60520930e5e0f0057a0575aff6c19"
 dependencies = [
- "chalk-derive",
- "chalk-ir",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "chalk-solve",
  "rustc-hash 1.1.0",
  "tracing",
@@ -314,10 +330,10 @@ version = "0.103.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "477ac6cdfd2013e9f93b09b036c2b607a67b2e728f4777b8422d55a79e9e3a34"
 dependencies = [
- "chalk-derive",
- "chalk-ir",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "ena",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.12.1",
  "petgraph",
  "rustc-hash 1.1.0",
@@ -341,9 +357,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.40"
+version = "4.5.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f"
+checksum = "1c1f056bae57e3e54c3375c41ff79619ddd13460a17d7438712bd0d83fda4ff8"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -351,9 +367,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.40"
+version = "4.5.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e"
+checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
 dependencies = [
  "anstream",
  "anstyle",
@@ -363,9 +379,9 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.40"
+version = "4.5.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce"
+checksum = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -375,9 +391,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.7.4"
+version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
+checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
 
 [[package]]
 name = "codeql-autobuilder-rust"
@@ -433,7 +449,7 @@ version = "0.1.0"
 dependencies = [
  "anyhow",
  "argfile",
- "chalk-ir",
+ "chalk-ir 0.104.0",
  "chrono",
  "clap",
  "codeql-extractor",
@@ -462,7 +478,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_with",
- "toml",
+ "toml 0.9.5",
  "tracing",
  "tracing-flame",
  "tracing-subscriber",
@@ -471,9 +487,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
 
 [[package]]
 name = "core-foundation-sys"
@@ -547,9 +563,9 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "darling"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -557,9 +573,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
 dependencies = [
  "fnv",
  "ident_case",
@@ -571,9 +587,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.10"
+version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
  "darling_core",
  "quote",
@@ -596,9 +612,9 @@ dependencies = [
 
 [[package]]
 name = "deranged"
-version = "0.3.11"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
+checksum = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e"
 dependencies = [
  "powerfmt",
  "serde",
@@ -817,21 +833,21 @@ checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
 [[package]]
 name = "getrandom"
-version = "0.3.1"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
- "wasi 0.13.3+wasi-0.2.2",
- "windows-targets 0.52.6",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
 ]
 
 [[package]]
 name = "glob"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 
 [[package]]
 name = "globset"
@@ -860,9 +876,9 @@ checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 
 [[package]]
 name = "hashbrown"
-version = "0.15.2"
+version = "0.15.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
+checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -875,7 +891,7 @@ version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7382cf6263419f2d8df38c55d7da83da5c18aef87fc7a7fc1fb1e344edfe14c1"
 dependencies = [
- "hashbrown 0.15.2",
+ "hashbrown 0.15.4",
 ]
 
 [[package]]
@@ -907,14 +923,15 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.61"
+version = "0.1.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
+checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
  "iana-time-zone-haiku",
  "js-sys",
+ "log 0.4.27",
  "wasm-bindgen",
  "windows-core",
 ]
@@ -1054,12 +1071,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
 dependencies = [
  "equivalent",
- "hashbrown 0.15.2",
+ "hashbrown 0.15.4",
  "serde",
 ]
 
@@ -1089,6 +1106,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "intrusive-collections"
+version = "0.9.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86"
+dependencies = [
+ "memoffset",
+]
+
 [[package]]
 name = "is_terminal_polyfill"
 version = "1.70.1"
@@ -1136,9 +1162,9 @@ checksum = "a037eddb7d28de1d0fc42411f501b53b75838d313908078d6698d064f3029b24"
 
 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.77"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -1146,9 +1172,9 @@ dependencies = [
 
 [[package]]
 name = "kqueue"
-version = "1.0.8"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c"
+checksum = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a"
 dependencies = [
  "kqueue-sys",
  "libc",
@@ -1184,9 +1210,9 @@ checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
 
 [[package]]
 name = "libredox"
-version = "0.1.3"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+checksum = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638"
 dependencies = [
  "bitflags 2.9.1",
  "libc",
@@ -1211,9 +1237,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
 
 [[package]]
 name = "lock_api"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -1269,14 +1295,14 @@ dependencies = [
 
 [[package]]
 name = "mio"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
 dependencies = [
  "libc",
  "log 0.4.27",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.52.0",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -1366,9 +1392,15 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.20.3"
+version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "once_cell_polyfill"
+version = "1.70.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
 
 [[package]]
 name = "oorandom"
@@ -1400,11 +1432,21 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "papaya"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f"
+dependencies = [
+ "equivalent",
+ "seize",
+]
+
 [[package]]
 name = "parking_lot"
-version = "0.12.3"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -1412,9 +1454,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.10"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1478,7 +1520,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
 ]
 
 [[package]]
@@ -1495,9 +1537,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "portable-atomic"
-version = "1.11.0"
+version = "1.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
@@ -1516,18 +1558,18 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
 dependencies = [
- "zerocopy 0.7.35",
+ "zerocopy",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1"
 dependencies = [
  "unicode-ident",
 ]
@@ -1554,11 +1596,17 @@ dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "ra-ap-rustc_abi"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612"
+checksum = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2"
 dependencies = [
  "bitflags 2.9.1",
  "ra-ap-rustc_hashes",
@@ -1568,18 +1616,18 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_hashes"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40"
+checksum = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad"
 dependencies = [
  "rustc-stable-hash",
 ]
 
 [[package]]
 name = "ra-ap-rustc_index"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a"
+checksum = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45"
 dependencies = [
  "ra-ap-rustc_index_macros",
  "smallvec",
@@ -1587,9 +1635,9 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_index_macros"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070"
+checksum = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1598,9 +1646,20 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_lexer"
-version = "0.116.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab"
+checksum = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36"
+dependencies = [
+ "memchr",
+ "unicode-properties",
+ "unicode-xid",
+]
+
+[[package]]
+name = "ra-ap-rustc_lexer"
+version = "0.123.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771"
 dependencies = [
  "memchr",
  "unicode-properties",
@@ -1609,19 +1668,19 @@ dependencies = [
 
 [[package]]
 name = "ra-ap-rustc_parse_format"
-version = "0.116.0"
+version = "0.121.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce"
+checksum = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97"
 dependencies = [
- "ra-ap-rustc_lexer",
- "rustc-literal-escaper 0.0.2",
+ "ra-ap-rustc_lexer 0.121.0",
+ "rustc-literal-escaper",
 ]
 
 [[package]]
 name = "ra-ap-rustc_pattern_analysis"
-version = "0.116.0"
+version = "0.123.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892"
+checksum = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904"
 dependencies = [
  "ra-ap-rustc_index",
  "rustc-hash 2.1.1",
@@ -1632,12 +1691,12 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_base_db"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "edf27fccb119fe85faf51f51847df9695d3cca30c2427fed9b4d71e6adebb54f"
+checksum = "47cac371778785196064f1a347fbbac0aafb1053786f17378bb138be59e57fc2"
 dependencies = [
  "dashmap",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "la-arena",
  "ra_ap_cfg",
  "ra_ap_intern",
@@ -1655,9 +1714,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_cfg"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cea86a5d6e84fd73824c26f52442807af911db038db821124b2ac65fac24209"
+checksum = "6789ed14467e6625bef45b29555844d0168d8af1bea9edb0f1d44f0a9b69f398"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_tt",
@@ -1667,19 +1726,19 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_edition"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5538d534eeb8526071610664dc64b71ca336b78f6933ff7241d10c1f37e91b"
+checksum = "637b74c692dc9d9b44394f8c0f91c063e1b6223c6e54f4ee89c943db2f2ee26e"
 
 [[package]]
 name = "ra_ap_hir"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44796828650900565917ddcc944fecdf6c7d5c3a8a31141f17268ea8c1d2e6f0"
+checksum = "a94c69a3830f0b6fbc36c1d098fcc9430f63c8d47ee6f93e3d6810c3bf440296"
 dependencies = [
  "arrayvec",
  "either",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "ra_ap_base_db",
  "ra_ap_cfg",
@@ -1699,9 +1758,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_def"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8949b2fb362a1e4eab4d90c7299f0fad3f2c887d9f7d9c286ac6530da4141f85"
+checksum = "7d94fcf7743db2f4f7e2c2911563847eb8efe2b7fb9fa430c107f0ac05962254"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.1",
@@ -1709,7 +1768,7 @@ dependencies = [
  "drop_bomb",
  "either",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "la-arena",
  "ra-ap-rustc_abi",
@@ -1737,9 +1796,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_expand"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22457a431b5eeb67517e03266fddefe48839b060a674a6b18bd84269012ede1e"
+checksum = "67ea3f6a0ba0c1e8b63f4a41bc596c07aeb2db2f99b67fa077820cfb5fce58bd"
 dependencies = [
  "cov-mark",
  "either",
@@ -1765,20 +1824,20 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_hir_ty"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a4b7a7531414203e11ae447627e2909250eff392c06278ab53ae2a022ecc9fc"
+checksum = "eccf6c291a88892e59e7591e081da8b9158f8c0b1ed9cb9b73d02d29a0d3d6d9"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.1",
- "chalk-derive",
- "chalk-ir",
+ "chalk-derive 0.103.0",
+ "chalk-ir 0.103.0",
  "chalk-recursive",
  "chalk-solve",
  "cov-mark",
  "either",
  "ena",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "la-arena",
  "oorandom",
@@ -1806,9 +1865,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_ide_db"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77741ceb096d4f5ecf5384210ea5a2b46878125047c6b0df2bdcfac08a20ea0c"
+checksum = "0bbbc97cc9837f91100711b65fb0d8ce9d7ed8da0dc418e08678d973d53da6a3"
 dependencies = [
  "arrayvec",
  "bitflags 2.9.1",
@@ -1816,7 +1875,7 @@ dependencies = [
  "crossbeam-channel",
  "either",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itertools 0.14.0",
  "line-index",
  "memchr",
@@ -1840,9 +1899,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_intern"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a1872cd5a425db6d5247a7deca11526e3104757f6732447ac6ee93c3e795725"
+checksum = "10f4785a674a41f9f52414fb7f19ab9a1d6886cad572e68721a883b0b85c256b"
 dependencies = [
  "dashmap",
  "hashbrown 0.14.5",
@@ -1852,9 +1911,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_load-cargo"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30f5433f056594b02f1879c5c2ce76ea9fd395f21e2a55df6ce3229db993caa"
+checksum = "f3be9990782fd2c2d90b67e2e0b4a86e7412ec8a0719950d9a68292924e85691"
 dependencies = [
  "anyhow",
  "crossbeam-channel",
@@ -1873,13 +1932,13 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_mbe"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "222a993acaec35e90c08357aecd530b7170cc3a7f13b3ddfd15a200029ccd555"
+checksum = "5b713f4d927f9d86391f66237019b8e5dbcad4ddbbe37c91c2e21adca258b9aa"
 dependencies = [
  "arrayvec",
  "cov-mark",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_intern",
  "ra_ap_parser",
  "ra_ap_span",
@@ -1892,33 +1951,33 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_parser"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c5693f5efd27832e1ac572ea756a1a4a3f7eba07f1287268ca111710971c2e5"
+checksum = "0d3fb8a5891c1c1d6fba5e58caa86b88f831990c878e361c54c1c1ff44ca8401"
 dependencies = [
  "drop_bomb",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_edition",
- "rustc-literal-escaper 0.0.3",
+ "rustc-literal-escaper",
  "tracing",
 ]
 
 [[package]]
 name = "ra_ap_paths"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39418eff64e59d4bf90dd825ac7d242576e9554669824ebc55a6628bde0aaf10"
+checksum = "9ccd5cfd0dae89ab2c70c4e5aa646f64bb8b5591622477342863c23a5f32dabc"
 dependencies = [
  "camino",
 ]
 
 [[package]]
 name = "ra_ap_proc_macro_api"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "14a315af8c4a9379c26abe7baa143d62e3975ff26f27c65332f9a5edccc56d38"
+checksum = "dae43c707bfb78f1b841ffb3731cc7876550463306c3b3986c20abd31033e7a2"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "ra_ap_intern",
  "ra_ap_paths",
  "ra_ap_span",
@@ -1933,9 +1992,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_profile"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08274a0adbf8255f8b2672302452e31bbb2ed4d38324da9c72a7bf9cf1428483"
+checksum = "95a7b93ca94cf0821e8bcac6bf8464cc94d7b3cbe63ffb74946a58ad03991fae"
 dependencies = [
  "cfg-if",
  "libc",
@@ -1945,9 +2004,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_project_model"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33deecb3724faf91f13b0f1b5115af7c4f5c9dc1dfbbf45f55261aa28f874838"
+checksum = "0751b9433a0dd49c6ae58c9572faf9557d2b53818370d72112b3adeaae5eabc4"
 dependencies = [
  "anyhow",
  "cargo_metadata",
@@ -1965,15 +2024,16 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
+ "temp-dir",
  "tracing",
  "triomphe",
 ]
 
 [[package]]
 name = "ra_ap_query-group-macro"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fdefdc9c8d6fd7d85ac572649378e83266262e09400bfdb7c8a7407d3cc2a3e"
+checksum = "5a82732eb8f5dc592d1d8d9bee23c1d66532e39293f02e23c7a546b60b35072b"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1982,9 +2042,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_span"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20071c89e1f7dd63c803130634f4bb6ce7783dc0e7ff90839d1d0f4e625b7a8"
+checksum = "c498ddf2d71705dcef9fb142269c0027c959a5eb17c435eea5466af7c3b9c47c"
 dependencies = [
  "hashbrown 0.14.5",
  "la-arena",
@@ -1998,9 +2058,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_stdx"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "552df390b26624eca7936aea1dbbb3786d7a12477e26ef917ffabba19f75ad44"
+checksum = "26ade567b0d692c7efd4ceb921cdbe182beca0b5af9a5cf05c07cf0e14db512a"
 dependencies = [
  "crossbeam-channel",
  "crossbeam-utils",
@@ -2014,9 +2074,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a78db1a9966c0fa05446b8185da35a325680741119366c6246e4a9800f29143a"
+checksum = "dba62d25b0296eb095d9db77e56d096417a89db4f4de1956add0d472ebcaf922"
 dependencies = [
  "either",
  "itertools 0.14.0",
@@ -2024,7 +2084,7 @@ dependencies = [
  "ra_ap_stdx",
  "rowan",
  "rustc-hash 2.1.1",
- "rustc-literal-escaper 0.0.3",
+ "rustc-literal-escaper",
  "smol_str",
  "tracing",
  "triomphe",
@@ -2032,9 +2092,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_syntax-bridge"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e69ef7fad8598d5c9f14a375d56ec12200fa927bc805b600af419611f4642fdb"
+checksum = "664466f2e824e285b671366f81128aa4a91b501fedbf7956a6bfb1f13d8b0b39"
 dependencies = [
  "ra_ap_intern",
  "ra_ap_parser",
@@ -2047,9 +2107,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_toolchain"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "628f3f190def67b1116d8bdd6ec4f6f206fada2c93b84ba71086d60c63429282"
+checksum = "2ef82cfc5eb8f9d4a3be9876ce019b78fbfdb8ff4f7e4dee9e384d65122096ab"
 dependencies = [
  "camino",
  "home",
@@ -2057,12 +2117,12 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_tt"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e050f4ad13df59e90e38332860304a3e85ff2fa8d4585b8cc44fc982923c82b1"
+checksum = "cbc858f5208f0d00f8638d14ab5ffab5d1bc79ad7fe1db5c5e0d478b9a02155c"
 dependencies = [
  "arrayvec",
- "ra-ap-rustc_lexer",
+ "ra-ap-rustc_lexer 0.123.0",
  "ra_ap_intern",
  "ra_ap_stdx",
  "text-size",
@@ -2070,13 +2130,13 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_vfs"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62082190f0b3551e4d941bcaaac51a7c39c85b2e193bcc50d0807e1701da4083"
+checksum = "e065b27829f5281d2ffc41de72551a0e4c4f49a9989ba7721676f414100c8af2"
 dependencies = [
  "crossbeam-channel",
  "fst",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "nohash-hasher",
  "ra_ap_paths",
  "ra_ap_stdx",
@@ -2086,9 +2146,9 @@ dependencies = [
 
 [[package]]
 name = "ra_ap_vfs-notify"
-version = "0.0.288"
+version = "0.0.300"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd7cfa1095b81bd1994ab70e5543c97a8733987eb0ddf390cf3ad58d4e2dc57"
+checksum = "5a3c795e86c9b5fcdbb99145e401a0d6348ed471ac96f1b7de151c0abe07a5af"
 dependencies = [
  "crossbeam-channel",
  "notify",
@@ -2103,9 +2163,9 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 dependencies = [
  "rand_chacha",
  "rand_core",
@@ -2123,12 +2183,11 @@ dependencies = [
 
 [[package]]
 name = "rand_core"
-version = "0.9.2"
+version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
  "getrandom",
- "zerocopy 0.8.20",
 ]
 
 [[package]]
@@ -2153,9 +2212,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.8"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
 dependencies = [
  "bitflags 2.9.1",
 ]
@@ -2259,21 +2318,15 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustc-literal-escaper"
-version = "0.0.2"
+version = "0.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04"
-
-[[package]]
-name = "rustc-literal-escaper"
-version = "0.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78744cd17f5d01c75b709e49807d1363e02a940ccee2e9e72435843fdb0d076e"
+checksum = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b"
 
 [[package]]
 name = "rustc-stable-hash"
-version = "0.1.1"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1"
+checksum = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08"
 
 [[package]]
 name = "rustc_apfloat"
@@ -2285,24 +2338,32 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "rustversion"
+version = "1.0.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+
 [[package]]
 name = "ryu"
-version = "1.0.19"
+version = "1.0.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "salsa"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8fff508e3d6ef42a32607f7538e17171a877a12015e32036f46e99d00c95781"
+checksum = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9"
 dependencies = [
  "boxcar",
  "crossbeam-queue",
- "dashmap",
- "hashbrown 0.15.2",
+ "crossbeam-utils",
+ "hashbrown 0.15.4",
  "hashlink",
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
+ "intrusive-collections",
+ "papaya",
  "parking_lot",
  "portable-atomic",
  "rayon",
@@ -2316,17 +2377,16 @@ dependencies = [
 
 [[package]]
 name = "salsa-macro-rules"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea72b3c06f2ce6350fe3a0eeb7aaaf842d1d8352b706973c19c4f02e298a87c"
+checksum = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce"
 
 [[package]]
 name = "salsa-macros"
-version = "0.22.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ce92025bc160b27814a207cb78d680973af17f863c7f4fc56cf3a535e22f378"
+checksum = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af"
 dependencies = [
- "heck",
  "proc-macro2",
  "quote",
  "syn",
@@ -2354,6 +2414,18 @@ dependencies = [
  "serde_json",
 ]
 
+[[package]]
+name = "schemars"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
+dependencies = [
+ "dyn-clone",
+ "ref-cast",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "1.0.1"
@@ -2366,6 +2438,16 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
+[[package]]
+name = "seize"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
 [[package]]
 name = "semver"
 version = "1.0.26"
@@ -2418,9 +2500,9 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.140"
+version = "1.0.142"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
 dependencies = [
  "itoa",
  "memchr",
@@ -2437,18 +2519,28 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_with"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42"
+checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
 dependencies = [
  "base64",
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.9.0",
- "schemars",
+ "indexmap 2.10.0",
+ "schemars 0.9.0",
+ "schemars 1.0.4",
  "serde",
  "serde_derive",
  "serde_json",
@@ -2458,9 +2550,9 @@ dependencies = [
 
 [[package]]
 name = "serde_with_macros"
-version = "3.13.0"
+version = "3.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77"
+checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -2474,7 +2566,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "itoa",
  "ryu",
  "serde",
@@ -2532,9 +2624,9 @@ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
-version = "2.0.103"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2543,15 +2635,21 @@ dependencies = [
 
 [[package]]
 name = "synstructure"
-version = "0.13.1"
+version = "0.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 dependencies = [
  "proc-macro2",
  "quote",
  "syn",
 ]
 
+[[package]]
+name = "temp-dir"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964"
+
 [[package]]
 name = "text-size"
 version = "1.1.1"
@@ -2564,33 +2662,13 @@ version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
 
-[[package]]
-name = "thiserror"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
-dependencies = [
- "thiserror-impl 1.0.69",
-]
-
 [[package]]
 name = "thiserror"
 version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
- "thiserror-impl 2.0.12",
-]
-
-[[package]]
-name = "thiserror-impl"
-version = "1.0.69"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "thiserror-impl",
 ]
 
 [[package]]
@@ -2616,9 +2694,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40"
 dependencies = [
  "deranged",
  "itoa",
@@ -2631,15 +2709,15 @@ dependencies = [
 
 [[package]]
 name = "time-core"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
+checksum = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c"
 
 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49"
 dependencies = [
  "num-conv",
  "time-core",
@@ -2662,11 +2740,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_edit",
 ]
 
+[[package]]
+name = "toml"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
+dependencies = [
+ "indexmap 2.10.0",
+ "serde",
+ "serde_spanned 1.0.0",
+ "toml_datetime 0.7.0",
+ "toml_parser",
+ "toml_writer",
+ "winnow",
+]
+
 [[package]]
 name = "toml_datetime"
 version = "0.6.11"
@@ -2676,26 +2769,50 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "toml_datetime"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "toml_edit"
 version = "0.22.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
 dependencies = [
- "indexmap 2.9.0",
+ "indexmap 2.10.0",
  "serde",
- "serde_spanned",
- "toml_datetime",
+ "serde_spanned 0.6.9",
+ "toml_datetime 0.6.11",
  "toml_write",
  "winnow",
 ]
 
+[[package]]
+name = "toml_parser"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
+dependencies = [
+ "winnow",
+]
+
 [[package]]
 name = "toml_write"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
 
+[[package]]
+name = "toml_writer"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+
 [[package]]
 name = "tracing"
 version = "0.1.41"
@@ -2709,9 +2826,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-attributes"
-version = "0.1.28"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2720,9 +2837,9 @@ dependencies = [
 
 [[package]]
 name = "tracing-core"
-version = "0.1.33"
+version = "0.1.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
 dependencies = [
  "once_cell",
  "valuable",
@@ -2866,9 +2983,9 @@ checksum = "a3e5df347f0bf3ec1d670aad6ca5c6a1859cd9ea61d2113125794654ccced68f"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "unicode-properties"
@@ -2913,9 +3030,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
+checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65"
 
 [[package]]
 name = "version_check"
@@ -2935,35 +3052,36 @@ dependencies = [
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasi"
-version = "0.13.3+wasi-0.2.2"
+version = "0.14.2+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
 dependencies = [
  "wit-bindgen-rt",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
 dependencies = [
  "cfg-if",
  "once_cell",
+ "rustversion",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
 dependencies = [
  "bumpalo",
  "log 0.4.27",
@@ -2975,9 +3093,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -2985,9 +3103,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2998,9 +3116,12 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
 
 [[package]]
 name = "winapi"
@@ -3035,18 +3156,62 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windows-core"
-version = "0.52.0"
+version = "0.61.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
+checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
 dependencies = [
- "windows-targets 0.52.6",
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
 ]
 
 [[package]]
 name = "windows-link"
-version = "0.1.1"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-result"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
+checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+dependencies = [
+ "windows-link",
+]
 
 [[package]]
 name = "windows-sys"
@@ -3280,9 +3445,9 @@ dependencies = [
 
 [[package]]
 name = "wit-bindgen-rt"
-version = "0.33.0"
+version = "0.39.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
 dependencies = [
  "bitflags 2.9.1",
 ]
@@ -3325,39 +3490,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.35"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
+checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
 dependencies = [
- "byteorder",
- "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]]
-name = "zerocopy-derive"
-version = "0.7.35"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn",
+ "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.20"
+version = "0.8.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700"
+checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/MODULE.bazel b/MODULE.bazel
index 52c07a395b5e..2f7a18b35fa1 100644
--- a/MODULE.bazel
+++ b/MODULE.bazel
@@ -14,7 +14,7 @@ local_path_override(
 
 # see https://registry.bazel.build/ for a list of available packages
 
-bazel_dep(name = "platforms", version = "0.0.11")
+bazel_dep(name = "platforms", version = "1.0.0")
 bazel_dep(name = "rules_go", version = "0.56.1")
 bazel_dep(name = "rules_pkg", version = "1.0.1")
 bazel_dep(name = "rules_nodejs", version = "6.2.0-codeql.1")
@@ -98,49 +98,49 @@ use_repo(
 tree_sitter_extractors_deps = use_extension("//misc/bazel/3rdparty:tree_sitter_extractors_extension.bzl", "r")
 use_repo(
     tree_sitter_extractors_deps,
-    "vendor_ts__anyhow-1.0.98",
+    "vendor_ts__anyhow-1.0.99",
     "vendor_ts__argfile-0.2.1",
-    "vendor_ts__chalk-ir-0.103.0",
+    "vendor_ts__chalk-ir-0.104.0",
     "vendor_ts__chrono-0.4.41",
-    "vendor_ts__clap-4.5.40",
+    "vendor_ts__clap-4.5.44",
     "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__glob-0.3.3",
     "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.17.0",
-    "vendor_ts__proc-macro2-1.0.95",
+    "vendor_ts__proc-macro2-1.0.97",
     "vendor_ts__quote-1.0.40",
-    "vendor_ts__ra_ap_base_db-0.0.288",
-    "vendor_ts__ra_ap_cfg-0.0.288",
-    "vendor_ts__ra_ap_hir-0.0.288",
-    "vendor_ts__ra_ap_hir_def-0.0.288",
-    "vendor_ts__ra_ap_hir_expand-0.0.288",
-    "vendor_ts__ra_ap_hir_ty-0.0.288",
-    "vendor_ts__ra_ap_ide_db-0.0.288",
-    "vendor_ts__ra_ap_intern-0.0.288",
-    "vendor_ts__ra_ap_load-cargo-0.0.288",
-    "vendor_ts__ra_ap_parser-0.0.288",
-    "vendor_ts__ra_ap_paths-0.0.288",
-    "vendor_ts__ra_ap_project_model-0.0.288",
-    "vendor_ts__ra_ap_span-0.0.288",
-    "vendor_ts__ra_ap_stdx-0.0.288",
-    "vendor_ts__ra_ap_syntax-0.0.288",
-    "vendor_ts__ra_ap_vfs-0.0.288",
-    "vendor_ts__rand-0.9.1",
+    "vendor_ts__ra_ap_base_db-0.0.300",
+    "vendor_ts__ra_ap_cfg-0.0.300",
+    "vendor_ts__ra_ap_hir-0.0.300",
+    "vendor_ts__ra_ap_hir_def-0.0.300",
+    "vendor_ts__ra_ap_hir_expand-0.0.300",
+    "vendor_ts__ra_ap_hir_ty-0.0.300",
+    "vendor_ts__ra_ap_ide_db-0.0.300",
+    "vendor_ts__ra_ap_intern-0.0.300",
+    "vendor_ts__ra_ap_load-cargo-0.0.300",
+    "vendor_ts__ra_ap_parser-0.0.300",
+    "vendor_ts__ra_ap_paths-0.0.300",
+    "vendor_ts__ra_ap_project_model-0.0.300",
+    "vendor_ts__ra_ap_span-0.0.300",
+    "vendor_ts__ra_ap_stdx-0.0.300",
+    "vendor_ts__ra_ap_syntax-0.0.300",
+    "vendor_ts__ra_ap_vfs-0.0.300",
+    "vendor_ts__rand-0.9.2",
     "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.13.0",
-    "vendor_ts__syn-2.0.103",
-    "vendor_ts__toml-0.8.23",
+    "vendor_ts__serde_json-1.0.142",
+    "vendor_ts__serde_with-3.14.0",
+    "vendor_ts__syn-2.0.104",
+    "vendor_ts__toml-0.9.5",
     "vendor_ts__tracing-0.1.41",
     "vendor_ts__tracing-flame-0.2.0",
     "vendor_ts__tracing-subscriber-0.3.19",
diff --git a/actions/extractor/codeql-extractor.yml b/actions/extractor/codeql-extractor.yml
index ab7374910054..a1b08602f32b 100644
--- a/actions/extractor/codeql-extractor.yml
+++ b/actions/extractor/codeql-extractor.yml
@@ -6,6 +6,8 @@ column_kind: "utf16"
 unicode_newlines: true
 build_modes:
   - none
+default_queries:
+  - codeql/actions-queries
 file_coverage_languages: []
 github_api_languages: []
 scc_languages: []
diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index bd6b24ef4871..5009104e9af3 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.4.16
+
+No user-facing changes.
+
 ## 0.4.15
 
 No user-facing changes.
diff --git a/actions/ql/lib/change-notes/released/0.4.16.md b/actions/ql/lib/change-notes/released/0.4.16.md
new file mode 100644
index 000000000000..d2472bd981f4
--- /dev/null
+++ b/actions/ql/lib/change-notes/released/0.4.16.md
@@ -0,0 +1,3 @@
+## 0.4.16
+
+No user-facing changes.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 613c98e4872c..0664e01a1ddb 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.15
+lastReleaseVersion: 0.4.16
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index 6ab370e2e979..5bc126007a27 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.15
+version: 0.4.16
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index 769ce155451d..265e67e6a89b 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.8
+
+No user-facing changes.
+
 ## 0.6.7
 
 No user-facing changes.
diff --git a/actions/ql/src/change-notes/released/0.6.8.md b/actions/ql/src/change-notes/released/0.6.8.md
new file mode 100644
index 000000000000..9984c422a379
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.8.md
@@ -0,0 +1,3 @@
+## 0.6.8
+
+No user-facing changes.
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index a6d2952e5fb0..cad7cba6ce36 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.7
+lastReleaseVersion: 0.6.8
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 416cd0e5c45a..27bfe21bcc3c 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.7
+version: 0.6.8
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
new file mode 100644
index 000000000000..c16b29b27f71
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/old.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * 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);
+
+/*- 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
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..5340d6d5f428
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/semmlecode.cpp.dbscheme
@@ -0,0 +1,2423 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * 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);
+
+/*- 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
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
new file mode 100644
index 000000000000..c0351e51e293
--- /dev/null
+++ b/cpp/downgrades/c16b29b27f71247023321cc0d0360998b318837c/upgrade.properties
@@ -0,0 +1,4 @@
+description: Link PCH creations and uses
+compatibility: full
+pch_uses.rel: delete
+pch_creations.rel: delete
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 7abedf38ee1c..705432b565de 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 5.5.0
+
+### New Features
+
+* Added a new class `PchFile` representing precompiled header (PCH) files used during project compilation.
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the `Microsoft::WRL::ComPtr` member functions.
+* The new dataflow/taint-tracking library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`) now resolves virtual function calls more precisely. This results in fewer false positives when running dataflow/taint-tracking queries on C++ projects.
+
 ## 5.4.1
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/lib/Customizations.qll b/cpp/ql/lib/Customizations.qll
new file mode 100644
index 000000000000..c9d899e07e01
--- /dev/null
+++ b/cpp/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `cpp.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import cpp
diff --git a/cpp/ql/lib/change-notes/released/5.5.0.md b/cpp/ql/lib/change-notes/released/5.5.0.md
new file mode 100644
index 000000000000..aad060fdd59e
--- /dev/null
+++ b/cpp/ql/lib/change-notes/released/5.5.0.md
@@ -0,0 +1,10 @@
+## 5.5.0
+
+### New Features
+
+* Added a new class `PchFile` representing precompiled header (PCH) files used during project compilation.
+
+### Minor Analysis Improvements
+
+* Added flow summaries for the `Microsoft::WRL::ComPtr` member functions.
+* The new dataflow/taint-tracking library (`semmle.code.cpp.dataflow.new.DataFlow` and `semmle.code.cpp.dataflow.new.TaintTracking`) now resolves virtual function calls more precisely. This results in fewer false positives when running dataflow/taint-tracking queries on C++ projects.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index 7adcb16ea286..4b8cf9533c17 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.4.1
+lastReleaseVersion: 5.5.0
diff --git a/cpp/ql/lib/cpp.qll b/cpp/ql/lib/cpp.qll
index ccd32c368e4b..46c651daf579 100644
--- a/cpp/ql/lib/cpp.qll
+++ b/cpp/ql/lib/cpp.qll
@@ -13,7 +13,9 @@
  *     https://github.com/cplusplus/draft/raw/master/papers/n4140.pdf
  */
 
+import Customizations
 import semmle.code.cpp.File
+import semmle.code.cpp.PchFile
 import semmle.code.cpp.Linkage
 import semmle.code.cpp.Location
 import semmle.code.cpp.Compilation
diff --git a/cpp/ql/lib/ext/ComPtr.model.yml b/cpp/ql/lib/ext/ComPtr.model.yml
new file mode 100644
index 000000000000..49be2c49a4bf
--- /dev/null
+++ b/cpp/ql/lib/ext/ComPtr.model.yml
@@ -0,0 +1,31 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr<T>", "(T *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(const ComPtr &)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ComPtr", "(ComPtr &&)", "", "Argument[*0].Element[@]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "As", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "AsIID", "", "", "Argument[-1]", "Argument[*1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "AsWeak", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Attach", "", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "CopyTo", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "CopyTo<T>", "(T **)", "", "Argument[-1].Element[@]", "Argument[**@0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "CopyTo", "(REFIID,void **)", "", "Argument[-1].Element[@]", "Argument[**@1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Detach", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Get", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "GetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "ReleaseAndGetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[-1]", "Argument[*0]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "Swap", "", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator&", "", "", "Argument[-1]", "ReturnValue.Element", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator->", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "operator=", "(T *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr<T>", True, "operator=", "(T *)", "", "Argument[*@0]", "ReturnValue[*].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=<U>", "(U *)", "", "Argument[*@0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=<U>", "(U *)", "", "Argument[*@0]", "ReturnValue[*].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(const ComPtr &)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(const ComPtr &)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(ComPtr &&)", "", "Argument[*0]", "Argument[-1]", "value", "manual"]
+      - ["Microsoft::WRL", "ComPtr", True, "operator=", "(ComPtr &&)", "", "Argument[*0]", "ReturnValue[*]", "value", "manual"]
diff --git a/cpp/ql/lib/ext/ComPtrRef.model.yml b/cpp/ql/lib/ext/ComPtrRef.model.yml
new file mode 100644
index 000000000000..710d9e6def35
--- /dev/null
+++ b/cpp/ql/lib/ext/ComPtrRef.model.yml
@@ -0,0 +1,12 @@
+extensions:
+  - addsTo:
+      pack: codeql/cpp-all
+      extensible: summaryModel
+    data: # namespace, type, subtypes, name, signature, ext, input, output, kind, provenance
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "ComPtrRef", "", "", "Argument[*0]", "Argument[-1].Element[@]", "value", "manual"]
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "GetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      # TODO: We cannot yet model https://learn.microsoft.com/en-us/cpp/cppcx/wrl/comptrref-class?view=msvc-170#operator-interfacetype-star-star
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "operator*", "", "", "Argument[-1].Element[@]", "ReturnValue[*@]", "value", "manual"]
+      # TODO: We cannot yet model https://learn.microsoft.com/en-us/cpp/cppcx/wrl/comptrref-class?view=msvc-170#operator-t-star
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "operator void**", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
+      - ["Microsoft::WRL::Details", "ComPtrRef", True, "ReleaseAndGetAddressOf", "", "", "Argument[-1].Element[@]", "ReturnValue[**@]", "value", "manual"]
\ No newline at end of file
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index c2892f44fcc2..dacf9f622134 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 5.4.1
+version: 5.5.0
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/PchFile.qll b/cpp/ql/lib/semmle/code/cpp/PchFile.qll
new file mode 100644
index 000000000000..6522edf6593c
--- /dev/null
+++ b/cpp/ql/lib/semmle/code/cpp/PchFile.qll
@@ -0,0 +1,26 @@
+/**
+ * Provides the `PchFile` class representing precompiled header (PCH) files created and
+ * used during the build process.
+ */
+
+import semmle.code.cpp.File
+
+/**
+ * A precompiled header (PCH) file created during the build process.
+ */
+class PchFile extends @pch {
+  /**
+   *  Gets a textual representation of this element.
+   */
+  string toString() { result = "PCH for " + this.getHeaderFile() }
+
+  /**
+   * Gets the header file from which the PCH file was created.
+   */
+  File getHeaderFile() { pch_creations(this, _, result) }
+
+  /**
+   * Gets a source file that includes the PCH.
+   */
+  File getAUse() { pch_uses(this, _, result) }
+}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
index b5e899bf0aac..0d63558c956e 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowDispatch.qll
@@ -1,8 +1,44 @@
 private import cpp
 private import semmle.code.cpp.ir.IR
-private import DataFlowPrivate
+private import semmle.code.cpp.ir.dataflow.DataFlow
+private import DataFlowPrivate as DataFlowPrivate
 private import DataFlowUtil
 private import DataFlowImplCommon as DataFlowImplCommon
+private import codeql.typetracking.TypeTracking
+private import SsaImpl as SsaImpl
+
+/**
+ * Holds if `f` has name `qualifiedName` and `nparams` parameter count. This is
+ * an approximation of its signature for the purpose of matching functions that
+ * might be the same across link targets.
+ */
+private predicate functionSignature(Function f, string qualifiedName, int nparams) {
+  qualifiedName = f.getQualifiedName() and
+  nparams = f.getNumberOfParameters() and
+  not f.isStatic()
+}
+
+/**
+ * Holds if `f` is a function with a body that has name `qualifiedName` and
+ * `nparams` parameter count. See `functionSignature`.
+ */
+private predicate functionSignatureWithBody(string qualifiedName, int nparams, Function f) {
+  functionSignature(f, qualifiedName, nparams) and
+  exists(f.getBlock())
+}
+
+/**
+ * Holds if the target of `call` is a function _with no definition_ that has
+ * name `qualifiedName` and `nparams` parameter count. See `functionSignature`.
+ */
+pragma[noinline]
+private predicate callSignatureWithoutBody(string qualifiedName, int nparams, CallInstruction call) {
+  exists(Function target |
+    target = call.getStaticCallTarget() and
+    not exists(target.getBlock()) and
+    functionSignature(target, qualifiedName, nparams)
+  )
+}
 
 /**
  * Gets a function that might be called by `call`.
@@ -11,7 +47,15 @@ private import DataFlowImplCommon as DataFlowImplCommon
  * from `AdditionalCallTarget` into account.
  */
 cached
-DataFlowCallable defaultViableCallable(DataFlowCall call) {
+DataFlowPrivate::DataFlowCallable defaultViableCallable(DataFlowPrivate::DataFlowCall call) {
+  result = defaultViableCallableWithoutLambda(call)
+  or
+  result = DataFlowImplCommon::viableCallableLambda(call, _)
+}
+
+private DataFlowPrivate::DataFlowCallable defaultViableCallableWithoutLambda(
+  DataFlowPrivate::DataFlowCall call
+) {
   DataFlowImplCommon::forceCachingInSameStage() and
   result = call.getStaticCallTarget()
   or
@@ -26,17 +70,13 @@ DataFlowCallable defaultViableCallable(DataFlowCall call) {
     functionSignatureWithBody(qualifiedName, nparams, result.getUnderlyingCallable()) and
     strictcount(Function other | functionSignatureWithBody(qualifiedName, nparams, other)) = 1
   )
-  or
-  // Virtual dispatch
-  result.asSourceCallable() = call.(VirtualDispatch::DataSensitiveCall).resolve()
 }
 
 /**
  * Gets a function that might be called by `call`.
  */
-cached
-DataFlowCallable viableCallable(DataFlowCall call) {
-  result = defaultViableCallable(call)
+private DataFlowPrivate::DataFlowCallable nonVirtualDispatch(DataFlowPrivate::DataFlowCall call) {
+  result = defaultViableCallableWithoutLambda(call)
   or
   // Additional call targets
   result.getUnderlyingCallable() =
@@ -44,228 +84,276 @@ DataFlowCallable viableCallable(DataFlowCall call) {
         .viableTarget(call.asCallInstruction().getUnconvertedResultExpression())
 }
 
+private class RelevantNode extends Node {
+  RelevantNode() { this.getType().stripType() instanceof Class }
+}
+
+private signature DataFlowPrivate::DataFlowCallable methodDispatchSig(
+  DataFlowPrivate::DataFlowCall c
+);
+
+private predicate ignoreConstructor(Expr e) {
+  e instanceof ConstructorDirectInit or
+  e instanceof ConstructorVirtualInit or
+  e instanceof ConstructorDelegationInit or
+  exists(ConstructorFieldInit init | init.getExpr() = e)
+}
+
 /**
- * Provides virtual dispatch support compatible with the original
- * implementation of `semmle.code.cpp.security.TaintTracking`.
+ * Holds if `n` is either:
+ * - the post-update node of a qualifier after a call to a constructor which
+ * constructs an object containing at least one virtual function.
+ * - a node which represents a derived-to-base instruction that converts from `c`.
  */
-private module VirtualDispatch {
-  /** A call that may dispatch differently depending on the qualifier value. */
-  abstract class DataSensitiveCall extends DataFlowCall {
-    /**
-     * Gets the node whose value determines the target of this call. This node
-     * could be the qualifier of a virtual dispatch or the function-pointer
-     * expression in a call to a function pointer. What they have in common is
-     * that we need to find out which data flows there, and then it's up to the
-     * `resolve` predicate to stitch that information together and resolve the
-     * call.
-     */
-    abstract Node getDispatchValue();
-
-    /** Gets a candidate target for this call. */
-    abstract Function resolve();
-
-    /**
-     * Whether `src` can flow to this call.
-     *
-     * Searches backwards from `getDispatchValue()` to `src`. The `allowFromArg`
-     * parameter is true when the search is allowed to continue backwards into
-     * a parameter; non-recursive callers should pass `_` for `allowFromArg`.
-     */
-    predicate flowsFrom(Node src, boolean allowFromArg) {
-      src = this.getDispatchValue() and allowFromArg = true
-      or
-      exists(Node other, boolean allowOtherFromArg | this.flowsFrom(other, allowOtherFromArg) |
-        // Call argument
-        exists(DataFlowCall call, Position i |
-          other.(ParameterNode).isParameterOf(pragma[only_bind_into](call).getStaticCallTarget(), i) and
-          src.(ArgumentNode).argumentOf(call, pragma[only_bind_into](pragma[only_bind_out](i)))
-        ) and
-        allowOtherFromArg = true and
-        allowFromArg = true
+private predicate qualifierSourceImpl(RelevantNode n, Class c) {
+  // Object construction
+  exists(CallInstruction call, ThisArgumentOperand qualifier, Call e |
+    qualifier = call.getThisArgumentOperand() and
+    n.(PostUpdateNode).getPreUpdateNode().asOperand() = qualifier and
+    call.getStaticCallTarget() instanceof Constructor and
+    qualifier.getType().stripType() = c and
+    c.getABaseClass*().getAMemberFunction().isVirtual() and
+    e = call.getUnconvertedResultExpression() and
+    not ignoreConstructor(e)
+  |
+    exists(c.getABaseClass())
+    or
+    exists(c.getADerivedClass())
+  )
+  or
+  // Conversion to a base class
+  exists(ConvertToBaseInstruction convert |
+    // Only keep the most specific cast
+    not convert.getUnary() instanceof ConvertToBaseInstruction and
+    n.asInstruction() = convert and
+    convert.getDerivedClass() = c and
+    c.getABaseClass*().getAMemberFunction().isVirtual()
+  )
+}
+
+private module TrackVirtualDispatch<methodDispatchSig/1 virtualDispatch0> {
+  /**
+   * Gets a possible runtime target of `c` using both static call-target
+   * information, and call-target resolution from `virtualDispatch0`.
+   */
+  private DataFlowPrivate::DataFlowCallable dispatch(DataFlowPrivate::DataFlowCall c) {
+    result = nonVirtualDispatch(c) or
+    result = virtualDispatch0(c)
+  }
+
+  private module TtInput implements TypeTrackingInput<Location> {
+    final class Node = RelevantNode;
+
+    class LocalSourceNode extends Node {
+      LocalSourceNode() {
+        this instanceof ParameterNode
         or
-        // Call return
-        exists(DataFlowCall call, ReturnKind returnKind |
-          other = getAnOutNode(call, returnKind) and
-          returnNodeWithKindAndEnclosingCallable(src, returnKind, call.getStaticCallTarget())
-        ) and
-        allowFromArg = false
+        this instanceof DataFlowPrivate::OutNode
         or
-        // Local flow
-        localFlowStep(src, other) and
-        allowFromArg = allowOtherFromArg
+        DataFlowPrivate::readStep(_, _, this)
         or
-        // Flow from global variable to load.
-        exists(LoadInstruction load, GlobalOrNamespaceVariable var |
-          var = src.asVariable() and
-          other.asInstruction() = load and
-          addressOfGlobal(load.getSourceAddress(), var) and
-          // The `allowFromArg` concept doesn't play a role when `src` is a
-          // global variable, so we just set it to a single arbitrary value for
-          // performance.
-          allowFromArg = true
-        )
+        DataFlowPrivate::storeStep(_, _, this)
+        or
+        DataFlowPrivate::jumpStep(_, this)
         or
-        // Flow from store to global variable.
-        exists(StoreInstruction store, GlobalOrNamespaceVariable var |
-          var = other.asVariable() and
-          store = src.asInstruction() and
-          storeIntoGlobal(store, var) and
-          // Setting `allowFromArg` to `true` like in the base case means we
-          // treat a store to a global variable like the dispatch itself: flow
-          // may come from anywhere.
-          allowFromArg = true
+        qualifierSourceImpl(this, _)
+      }
+    }
+
+    final private class ContentSetFinal = ContentSet;
+
+    class Content extends ContentSetFinal {
+      Content() {
+        exists(DataFlow::Content c |
+          this.isSingleton(c) and
+          c.getIndirectionIndex() = 1
         )
+      }
+    }
+
+    class ContentFilter extends Content {
+      Content getAMatchingContent() { result = this }
+    }
+
+    predicate compatibleContents(Content storeContents, Content loadContents) {
+      storeContents = loadContents
+    }
+
+    predicate simpleLocalSmallStep(Node nodeFrom, Node nodeTo) {
+      nodeFrom.getFunction() instanceof Function and
+      simpleLocalFlowStep(nodeFrom, nodeTo, _)
+    }
+
+    predicate levelStepNoCall(Node n1, LocalSourceNode n2) { none() }
+
+    predicate levelStepCall(Node n1, LocalSourceNode n2) { none() }
+
+    predicate storeStep(Node n1, Node n2, Content f) { DataFlowPrivate::storeStep(n1, f, n2) }
+
+    predicate callStep(Node n1, LocalSourceNode n2) {
+      exists(DataFlowPrivate::DataFlowCall call, DataFlowPrivate::Position pos |
+        n1.(DataFlowPrivate::ArgumentNode).argumentOf(call, pos) and
+        n2.(ParameterNode).isParameterOf(dispatch(call), pos)
+      )
+    }
+
+    predicate returnStep(Node n1, LocalSourceNode n2) {
+      exists(DataFlowPrivate::DataFlowCallable callable, DataFlowPrivate::DataFlowCall call |
+        n1.(DataFlowPrivate::ReturnNode).getEnclosingCallable() = callable and
+        callable = dispatch(call) and
+        n2 = DataFlowPrivate::getAnOutNode(call, n1.(DataFlowPrivate::ReturnNode).getKind())
       )
     }
+
+    predicate loadStep(Node n1, LocalSourceNode n2, Content f) {
+      DataFlowPrivate::readStep(n1, f, n2)
+    }
+
+    predicate loadStoreStep(Node nodeFrom, Node nodeTo, Content f1, Content f2) { none() }
+
+    predicate withContentStep(Node nodeFrom, LocalSourceNode nodeTo, ContentFilter f) { none() }
+
+    predicate withoutContentStep(Node nodeFrom, LocalSourceNode nodeTo, ContentFilter f) { none() }
+
+    predicate jumpStep(Node n1, LocalSourceNode n2) { DataFlowPrivate::jumpStep(n1, n2) }
+
+    predicate hasFeatureBacktrackStoreTarget() { none() }
   }
 
-  pragma[noinline]
-  private predicate storeIntoGlobal(StoreInstruction store, GlobalOrNamespaceVariable var) {
-    addressOfGlobal(store.getDestinationAddress(), var)
+  private predicate qualifierSource(RelevantNode n) { qualifierSourceImpl(n, _) }
+
+  /**
+   * Holds if `n` is the qualifier of `call` which targets the virtual member
+   * function `mf`.
+   */
+  private predicate qualifierOfVirtualCallImpl(
+    RelevantNode n, CallInstruction call, MemberFunction mf
+  ) {
+    n.asOperand() = call.getThisArgumentOperand() and
+    call.getStaticCallTarget() = mf and
+    mf.isVirtual()
   }
 
-  /** Holds if `addressInstr` is an instruction that produces the address of `var`. */
-  private predicate addressOfGlobal(Instruction addressInstr, GlobalOrNamespaceVariable var) {
-    // Access directly to the global variable
-    addressInstr.(VariableAddressInstruction).getAstVariable() = var
-    or
-    // Access to a field on a global union
-    exists(FieldAddressInstruction fa |
-      fa = addressInstr and
-      fa.getObjectAddress().(VariableAddressInstruction).getAstVariable() = var and
-      fa.getField().getDeclaringType() instanceof Union
+  private predicate qualifierOfVirtualCall(RelevantNode n) { qualifierOfVirtualCallImpl(n, _, _) }
+
+  private import TypeTracking<Location, TtInput>::TypeTrack<qualifierSource/1>::Graph<qualifierOfVirtualCall/1>
+
+  private predicate edgePlus(PathNode n1, PathNode n2) = fastTC(edges/2)(n1, n2)
+
+  /**
+   * Gets the most specific implementation of `mf` that may be called when the
+   * qualifier has runtime type `c`.
+   */
+  private MemberFunction mostSpecific(MemberFunction mf, Class c) {
+    qualifierOfVirtualCallImpl(_, _, mf) and
+    mf.getAnOverridingFunction*() = result and
+    (
+      result.getDeclaringType() = c
+      or
+      not c.getAMemberFunction().getAnOverriddenFunction*() = mf and
+      result = mostSpecific(mf, c.getABaseClass())
     )
   }
 
   /**
-   * A ReturnNode with its ReturnKind and its enclosing callable.
-   *
-   * Used to fix a join ordering issue in flowsFrom.
+   * Gets a possible pair of end-points `(p1, p2)` where:
+   * - `p1` is a derived-to-base conversion that converts from some
+   * class `derived`, and
+   * - `p2` is the qualifier of a call to a virtual function that may
+   * target `callable`, and
+   * - `callable` is the most specific implementation that may be called when
+   * the qualifier has type `derived`.
    */
-  pragma[noinline]
-  private predicate returnNodeWithKindAndEnclosingCallable(
-    ReturnNode node, ReturnKind kind, DataFlowCallable callable
+  private predicate pairCand(
+    PathNode p1, PathNode p2, DataFlowPrivate::DataFlowCallable callable,
+    DataFlowPrivate::DataFlowCall call
   ) {
-    node.getKind() = kind and
-    node.getFunction() = callable.getUnderlyingCallable()
+    exists(Class derived, MemberFunction mf |
+      qualifierSourceImpl(p1.getNode(), derived) and
+      qualifierOfVirtualCallImpl(p2.getNode(), call.asCallInstruction(), mf) and
+      p1.isSource() and
+      p2.isSink() and
+      callable.asSourceCallable() = mostSpecific(mf, derived)
+    )
   }
 
-  /** Call through a function pointer. */
-  private class DataSensitiveExprCall extends DataSensitiveCall {
-    DataSensitiveExprCall() { not exists(this.getStaticCallTarget()) }
-
-    override Node getDispatchValue() { result.asOperand() = this.getCallTargetOperand() }
-
-    override Function resolve() {
-      exists(FunctionInstruction fi |
-        this.flowsFrom(instructionNode(fi), _) and
-        result = fi.getFunctionSymbol()
-      ) and
-      (
-        this.getNumberOfArguments() <= result.getEffectiveNumberOfParameters() and
-        this.getNumberOfArguments() >= result.getEffectiveNumberOfParameters()
-        or
-        result.isVarargs()
-      )
-    }
+  /** Gets a possible run-time target of `call`. */
+  DataFlowPrivate::DataFlowCallable virtualDispatch(DataFlowPrivate::DataFlowCall call) {
+    exists(PathNode p1, PathNode p2 | p1 = p2 or edgePlus(p1, p2) | pairCand(p1, p2, result, call))
   }
+}
 
-  /** Call to a virtual function. */
-  private class DataSensitiveOverriddenFunctionCall extends DataSensitiveCall {
-    DataSensitiveOverriddenFunctionCall() {
-      exists(
-        this.getStaticCallTarget()
-            .getUnderlyingCallable()
-            .(VirtualFunction)
-            .getAnOverridingFunction()
-      )
-    }
+private DataFlowPrivate::DataFlowCallable noDisp(DataFlowPrivate::DataFlowCall call) { none() }
 
-    override Node getDispatchValue() { result.asInstruction() = this.getArgument(-1) }
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d1(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<noDisp/1>::virtualDispatch(call)
+}
 
-    override MemberFunction resolve() {
-      exists(Class overridingClass |
-        this.overrideMayAffectCall(overridingClass, result) and
-        this.hasFlowFromCastFrom(overridingClass)
-      )
-    }
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d2(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d1/1>::virtualDispatch(call)
+}
 
-    /**
-     * Holds if `this` is a virtual function call whose static target is
-     * overridden by `overridingFunction` in `overridingClass`.
-     */
-    pragma[noinline]
-    private predicate overrideMayAffectCall(Class overridingClass, MemberFunction overridingFunction) {
-      overridingFunction.getAnOverriddenFunction+() =
-        this.getStaticCallTarget().getUnderlyingCallable().(VirtualFunction) and
-      overridingFunction.getDeclaringType() = overridingClass
-    }
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d3(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d2/1>::virtualDispatch(call)
+}
 
-    /**
-     * Holds if the qualifier of `this` has flow from an upcast from
-     * `derivedClass`.
-     */
-    pragma[noinline]
-    private predicate hasFlowFromCastFrom(Class derivedClass) {
-      exists(ConvertToBaseInstruction toBase |
-        this.flowsFrom(instructionNode(toBase), _) and
-        derivedClass = toBase.getDerivedClass()
-      )
-    }
-  }
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d4(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d3/1>::virtualDispatch(call)
 }
 
-/**
- * Holds if `f` is a function with a body that has name `qualifiedName` and
- * `nparams` parameter count. See `functionSignature`.
- */
-private predicate functionSignatureWithBody(string qualifiedName, int nparams, Function f) {
-  functionSignature(f, qualifiedName, nparams) and
-  exists(f.getBlock())
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d5(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d4/1>::virtualDispatch(call)
 }
 
-/**
- * Holds if the target of `call` is a function _with no definition_ that has
- * name `qualifiedName` and `nparams` parameter count. See `functionSignature`.
- */
-pragma[noinline]
-private predicate callSignatureWithoutBody(string qualifiedName, int nparams, CallInstruction call) {
-  exists(Function target |
-    target = call.getStaticCallTarget() and
-    not exists(target.getBlock()) and
-    functionSignature(target, qualifiedName, nparams)
-  )
+pragma[nomagic]
+private DataFlowPrivate::DataFlowCallable d6(DataFlowPrivate::DataFlowCall call) {
+  result = TrackVirtualDispatch<d5/1>::virtualDispatch(call)
 }
 
-/**
- * Holds if `f` has name `qualifiedName` and `nparams` parameter count. This is
- * an approximation of its signature for the purpose of matching functions that
- * might be the same across link targets.
- */
-private predicate functionSignature(Function f, string qualifiedName, int nparams) {
-  qualifiedName = f.getQualifiedName() and
-  nparams = f.getNumberOfParameters() and
-  not f.isStatic()
+/** Gets a function that might be called by `call`. */
+cached
+DataFlowPrivate::DataFlowCallable viableCallable(DataFlowPrivate::DataFlowCall call) {
+  not exists(d6(call)) and
+  result = nonVirtualDispatch(call)
+  or
+  result = d6(call)
 }
 
 /**
  * Holds if the set of viable implementations that can be called by `call`
  * might be improved by knowing the call context.
  */
-predicate mayBenefitFromCallContext(DataFlowCall call) { mayBenefitFromCallContext(call, _, _) }
+predicate mayBenefitFromCallContext(DataFlowPrivate::DataFlowCall call) {
+  mayBenefitFromCallContext(call, _, _)
+}
+
+private predicate localLambdaFlowStep(Node nodeFrom, Node nodeTo) {
+  localFlowStep(nodeFrom, nodeTo)
+  or
+  DataFlowPrivate::additionalLambdaFlowStep(nodeFrom, nodeTo, _)
+}
 
 /**
  * Holds if `call` is a call through a function pointer, and the pointer
  * value is given as the `arg`'th argument to `f`.
  */
 private predicate mayBenefitFromCallContext(
-  VirtualDispatch::DataSensitiveCall call, DataFlowCallable f, int arg
+  DataFlowPrivate::DataFlowCall call, DataFlowPrivate::DataFlowCallable f, int arg
 ) {
   f = pragma[only_bind_out](call).getEnclosingCallable() and
   exists(InitializeParameterInstruction init |
-    not exists(call.getStaticCallTarget()) and
+    not exists(call.getStaticCallTarget())
+    or
+    exists(call.getStaticCallSourceTarget().(VirtualFunction).getAnOverridingFunction())
+  |
     init.getEnclosingFunction() = f.getUnderlyingCallable() and
-    call.flowsFrom(instructionNode(init), _) and
+    localLambdaFlowStep+(instructionNode(init),
+      operandNode(call.asCallInstruction().getCallTargetOperand())) and
     init.getParameter().getIndex() = arg
   )
 }
@@ -274,9 +362,11 @@ private predicate mayBenefitFromCallContext(
  * Gets a viable dispatch target of `call` in the context `ctx`. This is
  * restricted to those `call`s for which a context might make a difference.
  */
-DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {
+DataFlowPrivate::DataFlowCallable viableImplInCallContext(
+  DataFlowPrivate::DataFlowCall call, DataFlowPrivate::DataFlowCall ctx
+) {
   result = viableCallable(call) and
-  exists(int i, DataFlowCallable f |
+  exists(int i, DataFlowPrivate::DataFlowCallable f |
     mayBenefitFromCallContext(pragma[only_bind_into](call), f, i) and
     f = ctx.getStaticCallTarget() and
     result.asSourceCallable() =
@@ -286,4 +376,8 @@ DataFlowCallable viableImplInCallContext(DataFlowCall call, DataFlowCall ctx) {
 
 /** Holds if arguments at position `apos` match parameters at position `ppos`. */
 pragma[inline]
-predicate parameterMatch(ParameterPosition ppos, ArgumentPosition apos) { ppos = apos }
+predicate parameterMatch(
+  DataFlowPrivate::ParameterPosition ppos, DataFlowPrivate::ArgumentPosition apos
+) {
+  ppos = apos
+}
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 a03042a77ff0..582391e81cc9 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
@@ -1492,7 +1492,14 @@ predicate lambdaCall(DataFlowCall call, LambdaCallKind kind, Node receiver) {
 }
 
 /** Extra data-flow steps needed for lambda flow analysis. */
-predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) { none() }
+predicate additionalLambdaFlowStep(Node nodeFrom, Node nodeTo, boolean preservesValue) {
+  preservesValue = false and
+  exists(ContentSet cs | cs.isSingleton(any(UnionContent uc)) |
+    storeStep(nodeFrom, cs, nodeTo)
+    or
+    readStep(nodeFrom, cs, nodeTo)
+  )
+}
 
 predicate knownSourceModel(Node source, string model) { External::sourceNode(source, _, model) }
 
@@ -1873,9 +1880,7 @@ module IteratorFlow {
     }
   }
 
-  private module SsaInput implements SsaImpl::InputSig<Location> {
-    import Ssa::InputSigCommon
-
+  private module SsaInput implements SsaImpl::InputSig<Location, IRCfg::BasicBlock> {
     class SourceVariable = IteratorFlow::SourceVariable;
 
     /** A call to function that dereferences an iterator. */
@@ -1953,7 +1958,7 @@ module IteratorFlow {
      * Holds if `(bb, i)` contains a write to an iterator that may have been obtained
      * by calling `begin` (or related functions) on the variable `v`.
      */
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       certain = false and
       exists(GetsIteratorCall beginCall, Instruction writeToDeref, IRBlock bbQual, int iQual |
         isIteratorStoreInstruction(beginCall, writeToDeref) and
@@ -1964,12 +1969,12 @@ module IteratorFlow {
     }
 
     /** Holds if `(bb, i)` reads the container variable `v`. */
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       Ssa::variableRead(bb, i, v, certain)
     }
   }
 
-  private module IteratorSsa = SsaImpl::Make<Location, SsaInput>;
+  private module IteratorSsa = SsaImpl::Make<Location, IRCfg, SsaInput>;
 
   private module DataFlowIntegrationInput implements IteratorSsa::DataFlowIntegrationInputSig {
     private import codeql.util.Void
@@ -1982,7 +1987,7 @@ module IteratorFlow {
         )
       }
 
-      predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { bb.getInstruction(i) = this }
+      predicate hasCfgNode(IRCfg::BasicBlock bb, int i) { bb.getInstruction(i) = this }
     }
 
     predicate ssaDefHasSource(IteratorSsa::WriteDefinition def) { none() }
@@ -1992,20 +1997,16 @@ module IteratorFlow {
     class GuardValue = Void;
 
     class Guard extends Void {
-      predicate hasValueBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
-      ) {
+      predicate hasValueBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue val) {
         none()
       }
 
-      predicate valueControlsBranchEdge(
-        SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue val
-      ) {
+      predicate valueControlsBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue val) {
         none()
       }
     }
 
-    predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue val) {
+    predicate guardDirectlyControlsBlock(Guard guard, IRCfg::BasicBlock bb, GuardValue val) {
       none()
     }
 
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 a0a99711552c..ef4051171afb 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
@@ -795,7 +795,7 @@ class FinalGlobalValue extends Node, TFinalGlobalValue {
   override DataFlowType getType() {
     exists(int indirectionIndex |
       indirectionIndex = globalUse.getIndirectionIndex() and
-      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex - 1)
+      result = getTypeImpl(globalUse.getUnderlyingType(), indirectionIndex)
     )
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
index b9f320e57b23..d48a48dfb445 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImpl.qll
@@ -756,9 +756,9 @@ private predicate modeledFlowBarrier(Node n) {
     partialFlowFunc = call.getStaticCallTarget() and
     not partialFlowFunc.isPartialWrite(output)
   |
-    call.getStaticCallTarget().(DataFlow::DataFlowFunction).hasDataFlow(_, output)
+    partialFlowFunc.(DataFlow::DataFlowFunction).hasDataFlow(_, output)
     or
-    call.getStaticCallTarget().(Taint::TaintFunction).hasTaintFlow(_, output)
+    partialFlowFunc.(Taint::TaintFunction).hasTaintFlow(_, output)
   )
   or
   exists(Operand operand, Instruction instr, Node n0, int indirectionIndex |
@@ -891,15 +891,14 @@ private predicate baseSourceVariableIsGlobal(
   )
 }
 
-private module SsaInput implements Ssa::InputSig<Location> {
-  import InputSigCommon
+private module SsaInput implements Ssa::InputSig<Location, IRCfg::BasicBlock> {
   import SourceVariables
 
   /**
    * Holds if the `i`'th write in block `bb` writes to the variable `v`.
    * `certain` is `true` if the write is guaranteed to overwrite the entire variable.
    */
-  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableWrite(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     DataFlowImplCommon::forceCachingInSameStage() and
     (
       exists(DefImpl def | def.hasIndexInBlock(v, bb, i) |
@@ -917,7 +916,7 @@ private module SsaInput implements Ssa::InputSig<Location> {
    * Holds if the `i`'th read in block `bb` reads to the variable `v`.
    * `certain` is `true` if the read is guaranteed. For C++, this is always the case.
    */
-  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableRead(IRCfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     exists(UseImpl use | use.hasIndexInBlock(bb, i, v) |
       if use.isCertain() then certain = true else certain = false
     )
@@ -965,7 +964,7 @@ class GlobalDef extends Definition {
   GlobalLikeVariable getVariable() { result = impl.getVariable() }
 }
 
-private module SsaImpl = Ssa::Make<Location, SsaInput>;
+private module SsaImpl = Ssa::Make<Location, IRCfg, SsaInput>;
 
 private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationInputSig {
   private import codeql.util.Boolean
@@ -978,7 +977,7 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
       )
     }
 
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { bb.getInstruction(i) = this }
+    predicate hasCfgNode(IRCfg::BasicBlock bb, int i) { bb.getInstruction(i) = this }
   }
 
   Expr getARead(SsaImpl::Definition def) {
@@ -1006,9 +1005,7 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
   class Guard instanceof IRGuards::IRGuardCondition {
     string toString() { result = super.toString() }
 
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue branch) {
       exists(EdgeKind kind |
         super.getBlock() = bb1 and
         kind = getConditionalEdge(branch) and
@@ -1017,13 +1014,13 @@ private module DataFlowIntegrationInput implements SsaImpl::DataFlowIntegrationI
     }
 
     predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
+      IRCfg::BasicBlock bb1, IRCfg::BasicBlock bb2, GuardValue branch
     ) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, IRCfg::BasicBlock bb, GuardValue branch) {
     guard.(IRGuards::IRGuardCondition).controls(bb, branch)
   }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
index 617e2be8cc38..552f504b84b0 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/SsaImplCommon.qll
@@ -768,21 +768,3 @@ private module Cached {
 }
 
 import Cached
-
-/**
- * Inputs to the shared SSA library's parameterized module that is shared
- * between the SSA pruning stage, and the final SSA stage.
- */
-module InputSigCommon {
-  class BasicBlock extends IRBlock {
-    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
-
-    int length() { result = this.getInstructionCount() }
-  }
-
-  class ControlFlowNode = Instruction;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-}
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
index 50395db47e77..89efaa8e15af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/aliased_ssa/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,49 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  class ControlFlowNode = Instruction;
+
+  class SuccessorType = EdgeKind;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) { result = super.getSuccessor(t) }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
index 50395db47e77..89efaa8e15af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,49 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  class ControlFlowNode = Instruction;
+
+  class SuccessorType = EdgeKind;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) { result = super.getSuccessor(t) }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
index f7786fcf290a..f749f8b7502c 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/raw/internal/TranslatedExpr.qll
@@ -3884,7 +3884,7 @@ class TranslatedNewExpr extends TranslatedNewOrNewArrayExpr {
   final override Type getTargetType() { result = expr.getAllocatedType().getUnspecifiedType() }
 
   final override TranslatedInitialization getInitialization() {
-    result = getTranslatedInitialization(expr.getInitializer())
+    result = getTranslatedInitialization(expr.getInitializer().getFullyConverted())
   }
 }
 
diff --git a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
index 50395db47e77..89efaa8e15af 100644
--- a/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
+++ b/cpp/ql/lib/semmle/code/cpp/ir/implementation/unaliased_ssa/IRBlock.qll
@@ -7,6 +7,7 @@ import Instruction
 private import internal.IRBlockImports as Imports
 import Imports::EdgeKind
 private import Cached
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `block` is a block in `func` and `sortOverride`, `sortKey1`, and `sortKey2` are the
@@ -263,6 +264,49 @@ private predicate isEntryBlock(TIRBlock block) {
   block = MkIRBlock(any(EnterFunctionInstruction enter))
 }
 
+module IRCfg implements BB::CfgSig<Language::Location> {
+  class ControlFlowNode = Instruction;
+
+  class SuccessorType = EdgeKind;
+
+  final private class FinalIRBlock = IRBlock;
+
+  class BasicBlock extends FinalIRBlock {
+    ControlFlowNode getNode(int i) { result = this.getInstruction(i) }
+
+    ControlFlowNode getLastNode() { result = super.getLastInstruction() }
+
+    int length() { result = this.getInstructionCount() }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) { result = super.getSuccessor(t) }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    BasicBlock getImmediateDominator() { result.immediatelyDominates(this) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.dominanceFrontier() = df }
+
+    predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+    predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { isEntryBlock(this) }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
+
 cached
 private module Cached {
   cached
diff --git a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
index ce65a65319a8..757db13fe8c3 100644
--- a/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
+++ b/cpp/ql/lib/semmle/code/cpp/models/interfaces/FormattingFunction.qll
@@ -170,6 +170,16 @@ abstract class FormattingFunction extends ArrayFunction, TaintFunction {
       output.isParameterDeref(this.getOutputParameterIndex(_))
     )
   }
+
+  final override predicate isPartialWrite(FunctionOutput output) {
+    exists(int outputParameterIndex |
+      output.isParameterDeref(outputParameterIndex) and
+      // We require the output to be a stream since that definitely means that
+      // it's a partial write. If it's not a stream then it will most likely
+      // fill the whole buffer.
+      outputParameterIndex = this.getOutputParameterIndex(true)
+    )
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 5340d6d5f428..c16b29b27f71 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -222,6 +222,19 @@ extractor_version(
     string frontend_version: string ref
 )
 
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
 /** An element for which line-count information is available. */
 @sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
 
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index ef86a76e7edd..42cff5d8d16f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12642</v>
+            <v>12643</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,7 +10,7 @@
         </e>
         <e>
             <k>@file</k>
-            <v>65211</v>
+            <v>65212</v>
         </e>
         <e>
             <k>@folder</k>
@@ -22,11 +22,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>46965929</v>
+            <v>46945087</v>
+        </e>
+        <e>
+            <k>@pch</k>
+            <v>249</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40257319</v>
+            <v>40256583</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -34,7 +38,7 @@
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2740505</v>
+            <v>2738022</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -42,19 +46,19 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>698724</v>
+            <v>698728</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>86280</v>
+            <v>86202</v>
         </e>
         <e>
             <k>@conversion_function</k>
-            <v>10363</v>
+            <v>10354</v>
         </e>
         <e>
             <k>@operator</k>
-            <v>653036</v>
+            <v>652444</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -62,27 +66,27 @@
         </e>
         <e>
             <k>@deduction_guide</k>
-            <v>5868</v>
+            <v>5863</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4206778</v>
+            <v>4202967</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9391612</v>
+            <v>9383104</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1634963</v>
+            <v>1633482</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>407321</v>
+            <v>407775</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>267931</v>
+            <v>267822</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -94,27 +98,27 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>173266</v>
+            <v>173262</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7026197</v>
+            <v>7019832</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1496815</v>
+            <v>1497674</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>488591</v>
+            <v>488148</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>726232</v>
+            <v>726300</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>345733</v>
+            <v>347816</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -362,23 +366,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>452880</v>
+            <v>452469</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>693866</v>
+            <v>693238</v>
         </e>
         <e>
             <k>@array</k>
-            <v>90401</v>
+            <v>90319</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>684109</v>
+            <v>684112</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>968192</v>
+            <v>967314</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -390,7 +394,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>291306</v>
+            <v>291042</v>
         </e>
         <e>
             <k>@block</k>
@@ -410,7 +414,7 @@
         </e>
         <e>
             <k>@underlying_type</k>
-            <v>624</v>
+            <v>623</v>
         </e>
         <e>
             <k>@bases</k>
@@ -486,23 +490,23 @@
         </e>
         <e>
             <k>@struct</k>
-            <v>979865</v>
+            <v>979892</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20977</v>
+            <v>20958</v>
         </e>
         <e>
             <k>@enum</k>
-            <v>41337</v>
+            <v>41550</v>
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>867072</v>
+            <v>867095</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1762239</v>
+            <v>1762360</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -510,7 +514,7 @@
         </e>
         <e>
             <k>@class</k>
-            <v>325269</v>
+            <v>324974</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
@@ -518,31 +522,31 @@
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48438</v>
+            <v>48439</v>
         </e>
         <e>
             <k>@scoped_enum</k>
-            <v>11612</v>
+            <v>11601</v>
         </e>
         <e>
             <k>@template_struct</k>
-            <v>212078</v>
+            <v>212084</v>
         </e>
         <e>
             <k>@template_class</k>
-            <v>29342</v>
+            <v>29316</v>
         </e>
         <e>
             <k>@template_union</k>
-            <v>1373</v>
+            <v>1372</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6370039</v>
+            <v>6364268</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5902897</v>
+            <v>5903894</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -550,15 +554,15 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>604319</v>
+            <v>604322</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9727</v>
+            <v>9728</v>
         </e>
         <e>
             <k>@specifier</k>
-            <v>7741</v>
+            <v>7734</v>
         </e>
         <e>
             <k>@gnuattribute</k>
@@ -566,11 +570,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>353114</v>
+            <v>352794</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330047</v>
+            <v>330281</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -578,7 +582,7 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2166</v>
+            <v>2164</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
@@ -586,7 +590,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71875</v>
+            <v>71856</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -606,15 +610,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>476900</v>
+            <v>476902</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>700462</v>
+            <v>700465</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11241965</v>
+            <v>11233402</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -626,15 +630,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3041863</v>
+            <v>3041979</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13474606</v>
+            <v>13474601</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2251035</v>
+            <v>2251321</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -646,11 +650,11 @@
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953751</v>
+            <v>1953750</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915208</v>
+            <v>4915206</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -658,7 +662,7 @@
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4073</v>
+            <v>4069</v>
         </e>
         <e>
             <k>@complementexpr</k>
@@ -670,7 +674,7 @@
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84581</v>
+            <v>84571</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
@@ -686,11 +690,11 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897880</v>
+            <v>897879</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>571553</v>
+            <v>571552</v>
         </e>
         <e>
             <k>@subexpr</k>
@@ -702,7 +706,7 @@
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52393</v>
+            <v>52387</v>
         </e>
         <e>
             <k>@remexpr</k>
@@ -714,11 +718,11 @@
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>68024</v>
+            <v>68016</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>43951</v>
+            <v>43912</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
@@ -738,7 +742,7 @@
         </e>
         <e>
             <k>@xorexpr</k>
-            <v>73961</v>
+            <v>73952</v>
         </e>
         <e>
             <k>@eqexpr</k>
@@ -758,7 +762,7 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>81368</v>
+            <v>81358</v>
         </e>
         <e>
             <k>@leexpr</k>
@@ -786,7 +790,7 @@
         </e>
         <e>
             <k>@assignremexpr</k>
-            <v>874</v>
+            <v>873</v>
         </e>
         <e>
             <k>@assignlshiftexpr</k>
@@ -822,19 +826,19 @@
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103523</v>
+            <v>1103522</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>168440</v>
+            <v>168288</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435143</v>
+            <v>435142</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>239778</v>
+            <v>239780</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -846,7 +850,7 @@
         </e>
         <e>
             <k>@vaendexpr</k>
-            <v>2941</v>
+            <v>2940</v>
         </e>
         <e>
             <k>@vacopyexpr</k>
@@ -854,7 +858,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8254632</v>
+            <v>8254629</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -870,11 +874,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5732226</v>
+            <v>5732444</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405363</v>
+            <v>1405362</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -886,7 +890,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7967630</v>
+            <v>7966299</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -894,11 +898,11 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6026986</v>
+            <v>6026987</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>992324</v>
+            <v>992173</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -906,11 +910,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1902638</v>
+            <v>1903138</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2107314</v>
+            <v>2107325</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -970,11 +974,11 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1558310</v>
+            <v>1558277</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>46197</v>
+            <v>46198</v>
         </e>
         <e>
             <k>@delete_expr</k>
@@ -982,11 +986,11 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>24105</v>
+            <v>24178</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>408905</v>
+            <v>408920</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -1058,11 +1062,11 @@
         </e>
         <e>
             <k>@isemptyexpr</k>
-            <v>8865</v>
+            <v>8857</v>
         </e>
         <e>
             <k>@isenumexpr</k>
-            <v>2996</v>
+            <v>2994</v>
         </e>
         <e>
             <k>@ispodexpr</k>
@@ -1086,7 +1090,7 @@
         </e>
         <e>
             <k>@uuidof</k>
-            <v>26588</v>
+            <v>26677</v>
         </e>
         <e>
             <k>@delete_array_expr</k>
@@ -1110,11 +1114,11 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>206399</v>
+            <v>206212</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
-            <v>3621</v>
+            <v>3617</v>
         </e>
         <e>
             <k>@dtordirectdestruct</k>
@@ -1126,15 +1130,15 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39826</v>
+            <v>39827</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>348369</v>
+            <v>348053</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
-            <v>40089</v>
+            <v>40088</v>
         </e>
         <e>
             <k>@const_cast</k>
@@ -1150,7 +1154,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>164014</v>
+            <v>164066</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1158,7 +1162,7 @@
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
-            <v>3745</v>
+            <v>3742</v>
         </e>
         <e>
             <k>@isdestructibleexpr</k>
@@ -1174,15 +1178,15 @@
         </e>
         <e>
             <k>@istriviallyassignableexpr</k>
-            <v>3745</v>
+            <v>3742</v>
         </e>
         <e>
             <k>@isnothrowassignableexpr</k>
-            <v>5119</v>
+            <v>5114</v>
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3368</v>
+            <v>3367</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1190,7 +1194,7 @@
         </e>
         <e>
             <k>@istriviallycopyableexpr</k>
-            <v>1373</v>
+            <v>1372</v>
         </e>
         <e>
             <k>@isliteraltypeexpr</k>
@@ -1210,11 +1214,11 @@
         </e>
         <e>
             <k>@isconstructibleexpr</k>
-            <v>3621</v>
+            <v>3617</v>
         </e>
         <e>
             <k>@isnothrowconstructibleexpr</k>
-            <v>20727</v>
+            <v>20708</v>
         </e>
         <e>
             <k>@hasfinalizerexpr</k>
@@ -1254,7 +1258,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28356</v>
+            <v>28465</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1266,7 +1270,7 @@
         </e>
         <e>
             <k>@builtinaddressof</k>
-            <v>15483</v>
+            <v>15469</v>
         </e>
         <e>
             <k>@vec_fill</k>
@@ -1426,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>847007</v>
+            <v>847039</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1526,7 +1530,7 @@
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16502</v>
+            <v>16503</v>
         </e>
         <e>
             <k>@nested_requirement</k>
@@ -1538,15 +1542,15 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90430</v>
+            <v>90433</v>
         </e>
         <e>
             <k>@lambdacapture</k>
-            <v>31966</v>
+            <v>31965</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031614</v>
+            <v>2031613</v>
         </e>
         <e>
             <k>@stmt_if</k>
@@ -1558,19 +1562,19 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157904</v>
+            <v>157909</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>78022</v>
+            <v>78025</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1241797</v>
+            <v>1241788</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1729360</v>
+            <v>1728666</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
@@ -1582,11 +1586,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>836120</v>
+            <v>836152</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>411852</v>
+            <v>411868</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1594,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>772441</v>
+            <v>772425</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>429388</v>
+            <v>429404</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1606,11 +1610,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137937</v>
+            <v>137934</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26698</v>
+            <v>26740</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1630,15 +1634,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6387</v>
+            <v>6384</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43746</v>
+            <v>43781</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>106134</v>
+            <v>106037</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1658,7 +1662,7 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>591478</v>
+            <v>590942</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
@@ -1666,35 +1670,35 @@
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>158651</v>
+            <v>158633</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21916</v>
+            <v>21917</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>235118</v>
+            <v>234905</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>889777</v>
+            <v>888971</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>318555</v>
+            <v>318564</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2752617</v>
+            <v>2750123</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>100515</v>
+            <v>100424</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>406555</v>
+            <v>406187</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1702,7 +1706,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18827</v>
+            <v>18812</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1760,11 +1764,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12642</cardinality>
+            <cardinality>12643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1782,7 +1786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1808,11 +1812,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1012186</cardinality>
+            <cardinality>1012213</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1820,7 +1824,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29267</v>
+                    <v>29268</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2179,7 +2183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19381</v>
+                                    <v>19382</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2199,15 +2203,15 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>12642</cardinality>
+            <cardinality>2</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>2</v>
                 </e>
                 <e>
                     <k>mode</k>
-                    <v>10</v>
+                    <v>2</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2221,7 +2225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2235,9 +2239,9 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1197</a>
-                                    <b>1198</b>
-                                    <v>10</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2247,19 +2251,19 @@
         </relation>
         <relation>
             <name>compilation_compiling_files</name>
-            <cardinality>15739</cardinality>
+            <cardinality>15738</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2722</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4519</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>13670</v>
+                    <v>13668</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2447,7 +2451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12308</v>
+                                    <v>12307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2473,7 +2477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12526</v>
+                                    <v>12525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2493,15 +2497,15 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62959</cardinality>
+            <cardinality>62952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2723</v>
+                    <v>2722</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>4520</v>
+                    <v>4519</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -2509,7 +2513,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>13343</v>
+                    <v>13396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2574,7 +2578,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2723</v>
+                                    <v>2722</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2587,20 +2591,15 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>54</v>
-                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>653</v>
+                                    <v>816</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>653</v>
+                                    <v>544</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2619,23 +2618,23 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>14</b>
+                                    <b>15</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>18</b>
-                                    <v>163</v>
+                                    <a>15</a>
+                                    <b>19</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>22</b>
+                                    <a>19</a>
+                                    <b>26</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>103</b>
-                                    <v>217</v>
+                                    <a>42</a>
+                                    <b>92</b>
+                                    <v>163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2687,7 +2686,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4520</v>
+                                    <v>4519</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2700,6 +2699,11 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>54</v>
+                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
@@ -2708,38 +2712,43 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1034</v>
+                                    <v>980</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>326</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>381</v>
+                                    <v>544</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>326</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>326</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>22</b>
+                                    <b>14</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>91</b>
+                                    <a>17</a>
+                                    <b>44</b>
                                     <v>381</v>
                                 </b>
+                                <b>
+                                    <a>49</a>
+                                    <b>87</b>
+                                    <v>108</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -2794,13 +2803,13 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>148</a>
-                                    <b>149</b>
+                                    <a>144</a>
+                                    <b>145</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>154</a>
-                                    <b>155</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -2817,27 +2826,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6644</v>
+                                    <v>6807</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3267</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1797</v>
+                                    <v>1633</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1198</v>
+                                    <b>5</b>
+                                    <v>1034</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>48</b>
-                                    <v>435</v>
+                                    <a>5</a>
+                                    <b>45</b>
+                                    <v>544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2853,17 +2862,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5882</v>
+                                    <v>6208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2941</v>
+                                    <v>2668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1960</v>
+                                    <v>2069</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -2872,13 +2881,13 @@
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>7</b>
+                                    <b>8</b>
                                     <v>1198</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>73</b>
-                                    <v>435</v>
+                                    <a>8</a>
+                                    <b>74</b>
+                                    <v>326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2894,12 +2903,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9857</v>
+                                    <v>10510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3485</v>
+                                    <v>2831</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3155,15 +3169,15 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12642</cardinality>
+            <cardinality>12643</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12642</v>
+                    <v>12643</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9579</v>
+                    <v>9379</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -3181,7 +3195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3197,7 +3211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642</v>
+                                    <v>12643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3213,17 +3227,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8080</v>
+                                    <v>7763</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1077</v>
+                                    <v>1172</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>25</b>
-                                    <v>422</v>
+                                    <b>29</b>
+                                    <v>443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3239,12 +3253,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9051</v>
+                                    <v>8735</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>528</v>
+                                    <v>644</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3260,47 +3274,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
+                                    <b>3</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>31</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>12</a>
+                                    <b>15</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
+                                    <a>15</a>
+                                    <b>37</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>27</a>
-                                    <b>54</b>
+                                    <a>51</a>
+                                    <b>177</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>164</a>
-                                    <b>251</b>
+                                    <a>241</a>
+                                    <b>286</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>289</a>
-                                    <b>322</b>
-                                    <v>21</v>
+                                    <a>326</a>
+                                    <b>327</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3316,47 +3330,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>5</b>
+                                    <b>3</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>8</b>
+                                    <a>3</a>
+                                    <b>5</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>31</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>12</a>
+                                    <b>15</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>17</b>
+                                    <a>15</a>
+                                    <b>37</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>53</b>
+                                    <a>48</a>
+                                    <b>162</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>154</a>
-                                    <b>161</b>
+                                    <a>165</a>
+                                    <b>221</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>227</a>
-                                    <b>246</b>
-                                    <v>21</v>
+                                    <a>237</a>
+                                    <b>238</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3593,31 +3607,31 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46965929</cardinality>
+            <cardinality>46945087</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46965929</v>
+                    <v>46945087</v>
                 </e>
                 <e>
                     <k>file</k>
-                    <v>40955</v>
+                    <v>40918</v>
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7507421</v>
+                    <v>7500620</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
-                    <v>21975</v>
+                    <v>21956</v>
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7508545</v>
+                    <v>7501742</v>
                 </e>
                 <e>
                     <k>endColumn</k>
-                    <v>53441</v>
+                    <v>53393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3631,7 +3645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3647,7 +3661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3663,7 +3677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3679,7 +3693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3695,7 +3709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46965929</v>
+                                    <v>46945087</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3711,67 +3725,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>15</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>41</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>72</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>114</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>143</a>
                                     <b>211</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>213</a>
                                     <b>307</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>310</a>
                                     <b>430</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>437</a>
                                     <b>596</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>607</a>
                                     <b>827</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>839</a>
                                     <b>1298</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1300</a>
-                                    <b>2722</b>
-                                    <v>3121</v>
+                                    <b>2855</b>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>3114</a>
                                     <b>30788</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>57880</a>
@@ -3792,67 +3806,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>47</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>64</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>64</a>
                                     <b>84</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>85</a>
                                     <b>115</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>160</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>206</a>
                                     <b>291</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>298</a>
                                     <b>388</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>527</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>561</a>
                                     <b>1339</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1375</a>
                                     <b>57764</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3868,67 +3882,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>5</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>20</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>36</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>42</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>53</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>62</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>62</a>
                                     <b>81</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>95</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>111</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>112</a>
                                     <b>156</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3944,67 +3958,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>13</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>31</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>31</a>
                                     <b>46</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>63</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>84</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>84</a>
                                     <b>114</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>118</a>
                                     <b>160</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>160</a>
                                     <b>206</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>207</a>
                                     <b>291</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>300</a>
                                     <b>390</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>395</a>
                                     <b>562</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>564</a>
                                     <b>1350</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>1420</a>
                                     <b>57764</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4020,67 +4034,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>12</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>34</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>42</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>50</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>61</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>61</a>
                                     <b>67</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>67</a>
                                     <b>76</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>76</a>
                                     <b>88</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>102</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>116</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>133</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>136</a>
                                     <b>363</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4096,32 +4110,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961952</v>
+                                    <v>4957457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>779772</v>
+                                    <v>779066</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>544405</v>
+                                    <v>543911</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>570876</v>
+                                    <v>570359</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>563134</v>
+                                    <v>563372</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>637</b>
-                                    <v>87279</v>
+                                    <v>86452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4137,27 +4151,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5024010</v>
+                                    <v>5019458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1222414</v>
+                                    <v>1221306</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>640550</v>
+                                    <v>639969</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>57</b>
-                                    <v>563509</v>
+                                    <v>563248</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>329</b>
-                                    <v>56937</v>
+                                    <v>56636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4173,27 +4187,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5646455</v>
+                                    <v>5641339</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>483596</v>
+                                    <v>483158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>582613</v>
+                                    <v>582085</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>566256</v>
+                                    <v>565244</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>228500</v>
+                                    <v>228792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4209,12 +4223,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7041180</v>
+                                    <v>7034552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>466240</v>
+                                    <v>466067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4230,32 +4244,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5031002</v>
+                                    <v>5026444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>740066</v>
+                                    <v>739395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>540284</v>
+                                    <v>539795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>587483</v>
+                                    <v>586950</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>565257</v>
+                                    <v>564121</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>250</b>
-                                    <v>43327</v>
+                                    <v>43912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4271,67 +4285,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>40</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>49</a>
                                     <b>128</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>129</a>
                                     <b>253</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>316</a>
                                     <b>707</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>791</a>
                                     <b>1267</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>1281</a>
                                     <b>1943</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>2017</a>
                                     <b>2398</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>2491</a>
-                                    <b>3203</b>
-                                    <v>1748</v>
+                                    <a>2493</a>
+                                    <b>3212</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3252</a>
+                                    <a>3260</a>
                                     <b>7915</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>10983</a>
+                                    <a>11053</a>
                                     <b>121029</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4347,62 +4361,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>43</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>44</a>
                                     <b>60</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>93</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>96</a>
                                     <b>117</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>117</a>
                                     <b>150</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>169</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>169</a>
                                     <b>181</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>182</a>
                                     <b>217</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>243</a>
@@ -4423,67 +4437,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>101</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>108</a>
                                     <b>217</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>226</a>
+                                    <a>225</a>
                                     <b>543</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>633</a>
-                                    <b>1057</b>
-                                    <v>1748</v>
+                                    <b>1059</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1072</a>
-                                    <b>1409</b>
-                                    <v>1748</v>
+                                    <a>1071</a>
+                                    <b>1410</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1416</a>
-                                    <b>1614</b>
-                                    <v>1748</v>
+                                    <a>1414</a>
+                                    <b>1610</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1615</a>
-                                    <b>1810</b>
-                                    <v>1748</v>
+                                    <a>1613</a>
+                                    <b>1807</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1826</a>
-                                    <b>3777</b>
-                                    <v>1748</v>
+                                    <a>1834</a>
+                                    <b>3791</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3834</a>
+                                    <a>3837</a>
                                     <b>59554</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4499,67 +4513,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>36</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>102</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>109</a>
                                     <b>218</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>225</a>
+                                    <a>224</a>
                                     <b>545</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>631</a>
-                                    <b>1055</b>
-                                    <v>1748</v>
+                                    <b>1057</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1074</a>
+                                    <a>1073</a>
                                     <b>1407</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1425</a>
-                                    <b>1611</b>
-                                    <v>1748</v>
+                                    <a>1423</a>
+                                    <b>1609</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1614</a>
-                                    <b>1807</b>
-                                    <v>1748</v>
+                                    <a>1612</a>
+                                    <b>1805</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>1827</a>
-                                    <b>3760</b>
-                                    <v>1748</v>
+                                    <a>1835</a>
+                                    <b>3774</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>3827</a>
+                                    <a>3830</a>
                                     <b>59562</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4575,67 +4589,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>23</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>33</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>44</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>57</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                                 <b>
                                     <a>58</a>
-                                    <b>74</b>
-                                    <v>1997</v>
+                                    <b>73</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>77</a>
-                                    <b>86</b>
-                                    <v>1872</v>
+                                    <a>73</a>
+                                    <b>83</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>86</a>
-                                    <b>98</b>
-                                    <v>1748</v>
+                                    <a>83</a>
+                                    <b>92</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>98</a>
-                                    <b>160</b>
-                                    <v>1748</v>
+                                    <a>92</a>
+                                    <b>144</b>
+                                    <v>1746</v>
                                 </b>
                                 <b>
-                                    <a>258</a>
+                                    <a>147</a>
                                     <b>299</b>
-                                    <v>249</v>
+                                    <v>873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4651,32 +4665,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4959830</v>
+                                    <v>4955336</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782270</v>
+                                    <v>781561</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>545279</v>
+                                    <v>544785</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>568378</v>
+                                    <v>567864</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>96</b>
-                                    <v>564757</v>
+                                    <b>95</b>
+                                    <v>563497</v>
                                 </b>
                                 <b>
-                                    <a>96</a>
+                                    <a>95</a>
                                     <b>620</b>
-                                    <v>88028</v>
+                                    <v>88697</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4692,27 +4706,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5021138</v>
+                                    <v>5016589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1224911</v>
+                                    <v>1223801</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>633932</v>
+                                    <v>633357</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>564633</v>
+                                    <v>564121</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>329</b>
-                                    <v>63930</v>
+                                    <v>63872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4728,12 +4742,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7057912</v>
+                                    <v>7051643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>18</b>
-                                    <v>450632</v>
+                                    <b>15</b>
+                                    <v>450099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4749,27 +4763,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5645580</v>
+                                    <v>5640466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>480974</v>
+                                    <v>480538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>587607</v>
+                                    <v>587075</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>569752</v>
+                                    <v>568862</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>224629</v>
+                                    <v>224800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4785,32 +4799,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5029629</v>
+                                    <v>5025072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>744436</v>
+                                    <v>743762</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>540034</v>
+                                    <v>539545</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>588107</v>
+                                    <v>587574</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>563509</v>
+                                    <v>562749</v>
                                 </b>
                                 <b>
                                     <a>72</a>
                                     <b>250</b>
-                                    <v>42828</v>
+                                    <v>43038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4826,52 +4840,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15732</v>
+                                    <v>15718</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5618</v>
+                                    <v>5613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>33</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>106</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>689</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>721</a>
-                                    <b>2458</b>
-                                    <v>4120</v>
+                                    <b>2460</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2593</a>
-                                    <b>4731</b>
-                                    <v>4120</v>
+                                    <a>2595</a>
+                                    <b>4737</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>4759</a>
                                     <b>33780</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4887,52 +4901,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18604</v>
+                                    <v>18587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5618</v>
+                                    <v>5613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>16</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>80</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>152</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>158</a>
                                     <b>212</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>212</a>
                                     <b>265</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>265</a>
                                     <b>329</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4948,52 +4962,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15982</v>
+                                    <v>15968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>218</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>235</a>
-                                    <b>759</b>
-                                    <v>4120</v>
+                                    <a>234</a>
+                                    <b>758</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>768</a>
-                                    <b>2177</b>
-                                    <v>4120</v>
+                                    <a>767</a>
+                                    <b>2176</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2209</a>
-                                    <b>2884</b>
-                                    <v>4120</v>
+                                    <a>2206</a>
+                                    <b>2882</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2885</a>
+                                    <a>2890</a>
                                     <b>30763</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5009,52 +5023,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17231</v>
+                                    <v>17215</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6243</v>
+                                    <v>6237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>28</b>
-                                    <v>4120</v>
+                                    <v>4491</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>45</b>
-                                    <v>4245</v>
+                                    <b>46</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>69</b>
-                                    <v>4120</v>
+                                    <a>46</a>
+                                    <b>70</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>69</a>
-                                    <b>81</b>
-                                    <v>4245</v>
+                                    <a>70</a>
+                                    <b>82</b>
+                                    <v>4241</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
+                                    <a>82</a>
                                     <b>117</b>
-                                    <v>1498</v>
+                                    <v>1247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5070,52 +5084,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15982</v>
+                                    <v>15968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>4370</v>
+                                    <v>4366</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>41</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>217</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>233</a>
-                                    <b>756</b>
-                                    <v>4120</v>
+                                    <a>232</a>
+                                    <b>755</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>768</a>
-                                    <b>2177</b>
-                                    <v>4120</v>
+                                    <b>2176</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2208</a>
-                                    <b>2858</b>
-                                    <v>4120</v>
+                                    <a>2206</a>
+                                    <b>2862</b>
+                                    <v>4116</v>
                                 </b>
                                 <b>
-                                    <a>2868</a>
+                                    <a>2867</a>
                                     <b>30757</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5125,15 +5139,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>65211</cardinality>
+            <cardinality>65212</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>65211</v>
+                    <v>65212</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>65211</v>
+                    <v>65212</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5147,7 +5161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65211</v>
+                                    <v>65212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5163,7 +5177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65211</v>
+                                    <v>65212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5221,7 +5235,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77579</cardinality>
+            <cardinality>77581</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -5229,7 +5243,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77579</v>
+                    <v>77581</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5294,7 +5308,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77579</v>
+                                    <v>77581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5304,23 +5318,23 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>808616</cardinality>
+            <cardinality>807883</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>807492</v>
+                    <v>806761</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>39456</v>
+                    <v>39421</v>
                 </e>
                 <e>
                     <k>num_code</k>
-                    <v>34087</v>
+                    <v>34056</v>
                 </e>
                 <e>
                     <k>num_comment</k>
-                    <v>18230</v>
+                    <v>18338</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5334,12 +5348,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>805638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5355,12 +5369,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>805638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5376,7 +5390,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>807242</v>
+                                    <v>806511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5397,27 +5411,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26720</v>
+                                    <v>26696</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3745</v>
+                                    <v>3742</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>35</b>
-                                    <v>2996</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>39</a>
                                     <b>1983</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5433,27 +5447,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27220</v>
+                                    <v>27195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5469,27 +5483,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26845</v>
+                                    <v>26821</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4120</v>
+                                    <v>4116</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>3246</v>
+                                    <v>3243</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5505,32 +5519,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21851</v>
+                                    <v>21831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>13</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>198</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                                 <b>
                                     <a>204</a>
                                     <b>2092</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5546,32 +5560,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22225</v>
+                                    <v>22205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5587,27 +5601,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21975</v>
+                                    <v>21956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4245</v>
+                                    <v>4241</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5623,32 +5637,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <b>22</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
+                                    <a>42</a>
                                     <b>3651</b>
-                                    <v>998</v>
+                                    <v>873</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5664,32 +5678,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <b>27</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
+                                    <a>30</a>
                                     <b>48</b>
-                                    <v>874</v>
+                                    <v>748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5705,32 +5719,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11112</v>
+                                    <v>11352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2122</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>7</b>
-                                    <v>1373</v>
+                                    <b>8</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
-                                    <b>21</b>
-                                    <v>1373</v>
+                                    <a>8</a>
+                                    <b>31</b>
+                                    <v>1497</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
+                                    <a>35</a>
                                     <b>42</b>
-                                    <v>874</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6343,13 +6357,395 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>pch_uses</name>
+            <cardinality>4134</cardinality>
+            <columnsizes>
+                <e>
+                    <k>pch</k>
+                    <v>162</v>
+                </e>
+                <e>
+                    <k>compilation</k>
+                    <v>4134</v>
+                </e>
+                <e>
+                    <k>id</k>
+                    <v>4134</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>pch</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>87</a>
+                                    <b>88</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>108</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>pch</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>24</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>11</a>
+                                    <b>12</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>14</a>
+                                    <b>15</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>16</v>
+                                </b>
+                                <b>
+                                    <a>24</a>
+                                    <b>25</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>25</a>
+                                    <b>26</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>26</a>
+                                    <b>27</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>36</a>
+                                    <b>37</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>42</a>
+                                    <b>43</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>52</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>87</a>
+                                    <b>88</b>
+                                    <v>8</v>
+                                </b>
+                                <b>
+                                    <a>107</a>
+                                    <b>108</b>
+                                    <v>8</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4134</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>pch_creations</name>
+            <cardinality>249</cardinality>
+            <columnsizes>
+                <e>
+                    <k>pch</k>
+                    <v>249</v>
+                </e>
+                <e>
+                    <k>compilation</k>
+                    <v>249</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>249</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>pch</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>pch</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>compilation</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>pch</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>compilation</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>249</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4200439</cardinality>
+            <cardinality>4200551</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5766</v>
+                    <v>5767</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -6357,11 +6753,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58715</v>
+                    <v>58716</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39513</v>
+                    <v>39514</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6606,7 +7002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11026</v>
+                                    <v>11027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6651,7 +7047,7 @@
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4921</v>
+                                    <v>4922</v>
                                 </b>
                                 <b>
                                     <a>128</a>
@@ -6677,7 +7073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58715</v>
+                                    <v>58716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6693,7 +7089,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11586</v>
+                                    <v>11587</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6774,12 +7170,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2460</v>
+                                    <v>2461</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2967</v>
+                                    <v>2968</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -6840,7 +7236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39502</v>
+                                    <v>39503</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6936,15 +7332,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149995963</cardinality>
+            <cardinality>149995903</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24670878</v>
+                    <v>24670868</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705272</v>
+                    <v>3705270</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -6968,22 +7364,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620369</v>
+                                    <v>1620368</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6582545</v>
+                                    <v>6582542</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719001</v>
+                                    <v>8718997</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557049</v>
+                                    <v>3557047</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7024,12 +7420,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282153</v>
+                                    <v>282152</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330247</v>
+                                    <v>330246</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7064,15 +7460,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48735840</cardinality>
+            <cardinality>48735823</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7044740</v>
+                    <v>7044739</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803121</v>
+                    <v>3803120</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7091,7 +7487,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766305</v>
+                                    <v>766304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7142,7 +7538,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>301088</v>
+                                    <v>301087</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7202,19 +7598,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40338469</cardinality>
+            <cardinality>40337724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40338469</v>
+                    <v>40337724</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182070</v>
+                    <v>182049</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5912755</v>
+                    <v>5912934</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7232,7 +7628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7248,7 +7644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7264,7 +7660,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338469</v>
+                                    <v>40337724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7280,47 +7676,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60781</v>
+                                    <v>60773</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27558</v>
+                                    <v>27555</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17972</v>
+                                    <v>17970</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10021</v>
+                                    <v>10020</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>13779</v>
+                                    <v>13777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>13</b>
-                                    <v>14705</v>
+                                    <v>14703</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>33</b>
-                                    <v>13779</v>
+                                    <v>13777</v>
                                 </b>
                                 <b>
                                     <a>33</a>
                                     <b>180</b>
-                                    <v>13670</v>
+                                    <v>13668</v>
                                 </b>
                                 <b>
                                     <a>181</a>
-                                    <b>72144</b>
-                                    <v>9803</v>
+                                    <b>72152</b>
+                                    <v>9802</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7336,42 +7732,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77283</v>
+                                    <v>77274</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>30553</v>
+                                    <v>30550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>14323</v>
+                                    <v>14322</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>10293</v>
+                                    <v>10292</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14105</v>
+                                    <v>14104</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>18</b>
-                                    <v>14160</v>
+                                    <v>14158</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>88</b>
-                                    <v>13670</v>
+                                    <v>13668</v>
                                 </b>
                                 <b>
                                     <a>89</a>
-                                    <b>12189</b>
-                                    <v>7679</v>
+                                    <b>12187</b>
+                                    <v>7678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7387,7 +7783,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177495</v>
+                                    <v>177475</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7408,17 +7804,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5255927</v>
+                                    <v>5256183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>422362</v>
+                                    <v>422313</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>72144</b>
-                                    <v>234464</v>
+                                    <b>72152</b>
+                                    <v>234437</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7434,12 +7830,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5890588</v>
+                                    <v>5890770</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>37</b>
-                                    <v>22166</v>
+                                    <v>22163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7455,7 +7851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5912755</v>
+                                    <v>5912934</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7474,8 +7870,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>739164</a>
-                                    <b>739165</b>
+                                    <a>739237</a>
+                                    <b>739238</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -7516,8 +7912,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>107495</a>
-                                    <b>107496</b>
+                                    <a>107511</a>
+                                    <b>107512</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -7528,15 +7924,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33655984</cardinality>
+            <cardinality>33655149</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33655984</v>
+                    <v>33655149</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15926379</v>
+                    <v>15926203</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7550,7 +7946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33655984</v>
+                                    <v>33655149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7566,27 +7962,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7806498</v>
+                                    <v>7806456</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595448</v>
+                                    <v>1595479</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4702906</v>
+                                    <v>4702955</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1295464</v>
+                                    <v>1295312</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>526061</v>
+                                    <v>525999</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7596,15 +7992,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6046191</cardinality>
+            <cardinality>6040022</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4227950</v>
+                    <v>4221190</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2278566</v>
+                    <v>2279306</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7618,27 +8014,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3302009</v>
+                                    <v>3294948</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>491104</v>
+                                    <v>491264</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7893</v>
+                                    <v>7896</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>413756</v>
+                                    <v>413891</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>13185</v>
+                                    <v>13189</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7654,27 +8050,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1336578</v>
+                                    <v>1337013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481984</v>
+                                    <v>482141</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7807</v>
+                                    <v>7810</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>428082</v>
+                                    <v>428221</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24112</v>
+                                    <v>24119</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7684,11 +8080,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82497361</cardinality>
+            <cardinality>82495572</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26285935</v>
+                    <v>26282637</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -7696,7 +8092,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>343260</v>
+                    <v>343270</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7710,22 +8106,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9683509</v>
+                                    <v>9679766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9770372</v>
+                                    <v>9770635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002131</v>
+                                    <v>5002265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829922</v>
+                                    <v>1829971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7741,22 +8137,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9866140</v>
+                                    <v>9862401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9787916</v>
+                                    <v>9788179</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4845472</v>
+                                    <v>4845602</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1786405</v>
+                                    <v>1786453</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7781,7 +8177,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488681</b>
+                                    <b>2488302</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -7824,12 +8220,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39703</v>
+                                    <v>39704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62327</v>
+                                    <v>62329</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7839,37 +8235,37 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34580</v>
+                                    <v>34581</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39249</v>
+                                    <v>39250</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30873</v>
+                                    <v>30874</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28982</v>
+                                    <v>28983</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25887</v>
+                                    <v>25888</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27144</v>
+                                    <v>27145</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25993</v>
+                                    <v>25994</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -7890,12 +8286,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243173</v>
+                                    <v>243180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89873</v>
+                                    <v>89876</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7910,11 +8306,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82497361</cardinality>
+            <cardinality>82495572</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26285935</v>
+                    <v>26282637</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -7922,7 +8318,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207927</v>
+                    <v>207933</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7936,22 +8332,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9683509</v>
+                                    <v>9679766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9770372</v>
+                                    <v>9770635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002131</v>
+                                    <v>5002265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829922</v>
+                                    <v>1829971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7967,22 +8363,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12642108</v>
+                                    <v>12638444</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8428244</v>
+                                    <v>8428470</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4225217</v>
+                                    <v>4225331</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>990364</v>
+                                    <v>990391</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8007,7 +8403,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488681</b>
+                                    <b>2488302</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8055,17 +8451,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26859</v>
+                                    <v>26860</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43495</v>
+                                    <v>43496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15906</v>
+                                    <v>15907</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8080,7 +8476,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18969</v>
+                                    <v>18970</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -8090,7 +8486,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15779</v>
+                                    <v>15780</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -8099,7 +8495,7 @@
                                 </b>
                                 <b>
                                     <a>252</a>
-                                    <b>1169584</b>
+                                    <b>1169205</b>
                                     <v>9495</v>
                                 </b>
                             </bs>
@@ -8116,12 +8512,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105083</v>
+                                    <v>105086</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88912</v>
+                                    <v>88914</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8136,19 +8532,19 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4053071</cardinality>
+            <cardinality>4049399</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053071</v>
+                    <v>4049399</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1694897</v>
+                    <v>1693362</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>874</v>
+                    <v>873</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8162,7 +8558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053071</v>
+                                    <v>4049399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8178,7 +8574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053071</v>
+                                    <v>4049399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8194,17 +8590,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448542</v>
+                                    <v>1447229</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139098</v>
+                                    <v>138971</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>107257</v>
+                                    <v>107160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8220,12 +8616,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1692026</v>
+                                    <v>1690493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8338,15 +8734,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1141555</cardinality>
+            <cardinality>1141561</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1137808</v>
+                    <v>1137813</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1141555</v>
+                    <v>1141561</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8360,7 +8756,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134605</v>
+                                    <v>1134611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8381,7 +8777,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141555</v>
+                                    <v>1141561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8391,15 +8787,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4070552</cardinality>
+            <cardinality>4066864</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053071</v>
+                    <v>4049399</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>619822</v>
+                    <v>619261</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8413,12 +8809,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035590</v>
+                                    <v>4031934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17480</v>
+                                    <v>17465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8434,27 +8830,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>310161</v>
+                                    <v>309880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>213891</v>
+                                    <v>213697</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48072</v>
+                                    <v>48028</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>365</b>
-                                    <v>46574</v>
+                                    <v>46531</v>
                                 </b>
                                 <b>
                                     <a>432</a>
                                     <b>9944</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8734,59 +9130,59 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>131414</cardinality>
+            <cardinality>131703</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>131414</v>
+                    <v>131703</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>88085</cardinality>
+            <cardinality>88088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88085</v>
+                    <v>88088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51680</cardinality>
+            <cardinality>51682</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51680</v>
+                    <v>51682</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4051572</cardinality>
+            <cardinality>4047902</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4051572</v>
+                    <v>4047902</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>deduction_guide_for_class</name>
-            <cardinality>5868</cardinality>
+            <cardinality>5863</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5868</v>
+                    <v>5863</v>
                 </e>
                 <e>
                     <k>class_template</k>
-                    <v>2247</v>
+                    <v>2245</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8800,7 +9196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5868</v>
+                                    <v>5863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8816,7 +9212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8851,15 +9247,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>674762</cardinality>
+            <cardinality>674151</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>674762</v>
+                    <v>674151</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>176182</v>
+                    <v>176022</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8873,7 +9269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674762</v>
+                                    <v>674151</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8889,37 +9285,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47198</v>
+                                    <v>47155</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36959</v>
+                                    <v>36926</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32714</v>
+                                    <v>32684</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>20103</v>
+                                    <v>20084</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>12860</v>
+                                    <v>12849</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>14484</v>
+                                    <v>14471</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>65</b>
-                                    <v>11862</v>
+                                    <v>11851</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8929,27 +9325,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4212771</cardinality>
+            <cardinality>4208955</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4206778</v>
+                    <v>4202967</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4028473</v>
+                    <v>4024823</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>611831</v>
+                    <v>611277</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1693399</v>
+                    <v>1691865</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2815798</v>
+                    <v>2813247</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8963,7 +9359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8979,12 +9375,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4200784</v>
+                                    <v>4196979</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5993</v>
+                                    <v>5988</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9000,7 +9396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9016,7 +9412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206778</v>
+                                    <v>4202967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9032,12 +9428,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3864776</v>
+                                    <v>3861275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>163696</v>
+                                    <v>163547</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9053,12 +9449,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4009993</v>
+                                    <v>4006360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18479</v>
+                                    <v>18463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9074,7 +9470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4028473</v>
+                                    <v>4024823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9090,12 +9486,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3885254</v>
+                                    <v>3881734</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>143218</v>
+                                    <v>143088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9111,27 +9507,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295427</v>
+                                    <v>295159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>220758</v>
+                                    <v>220558</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48447</v>
+                                    <v>48403</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>364</b>
-                                    <v>45949</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>364</a>
                                     <b>10292</b>
-                                    <v>1248</v>
+                                    <v>1247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9147,22 +9543,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>305541</v>
+                                    <v>305264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212018</v>
+                                    <v>211826</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48072</v>
+                                    <v>48028</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>1163</b>
-                                    <v>45949</v>
+                                    <v>45908</v>
                                 </b>
                                 <b>
                                     <a>1483</a>
@@ -9183,22 +9579,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491962</v>
+                                    <v>491516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52942</v>
+                                    <v>52894</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>50195</v>
+                                    <v>50149</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>2238</b>
-                                    <v>16731</v>
+                                    <v>16716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9214,22 +9610,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>455377</v>
+                                    <v>454964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69549</v>
+                                    <v>69485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>56063</v>
+                                    <v>56012</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30841</v>
+                                    <v>30813</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9245,22 +9641,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332543</v>
+                                    <v>1331336</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>194662</v>
+                                    <v>194485</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129608</v>
+                                    <v>129490</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36585</v>
+                                    <v>36551</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9276,17 +9672,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448042</v>
+                                    <v>1446730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139597</v>
+                                    <v>139470</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>105759</v>
+                                    <v>105663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9302,12 +9698,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1603497</v>
+                                    <v>1602045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1596</b>
-                                    <v>89901</v>
+                                    <v>89820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9323,17 +9719,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368504</v>
+                                    <v>1367264</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>208522</v>
+                                    <v>208333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>116372</v>
+                                    <v>116267</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9349,17 +9745,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2422477</v>
+                                    <v>2420283</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251724</v>
+                                    <v>251496</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141595</v>
+                                    <v>141466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9375,17 +9771,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2441207</v>
+                                    <v>2438995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233494</v>
+                                    <v>233283</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>141095</v>
+                                    <v>140967</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9401,12 +9797,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2701298</v>
+                                    <v>2698851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>114499</v>
+                                    <v>114396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9422,12 +9818,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2776590</v>
+                                    <v>2774075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>39207</v>
+                                    <v>39171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9437,11 +9833,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1423569</cardinality>
+            <cardinality>1422279</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1423569</v>
+                    <v>1422279</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9470,15 +9866,15 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4283569</cardinality>
+            <cardinality>4279688</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1749837</v>
+                    <v>1748252</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1373</v>
+                    <v>1372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9492,22 +9888,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>363228</v>
+                                    <v>362899</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>262463</v>
+                                    <v>262225</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1101171</v>
+                                    <v>1100174</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>22974</v>
+                                    <v>22954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9704,22 +10100,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>420457</cardinality>
+            <cardinality>420911</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>420457</v>
+                    <v>420911</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>141829</cardinality>
+            <cardinality>141830</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>141829</v>
+                    <v>141830</v>
                 </e>
                 <e>
                     <k>constant</k>
@@ -9737,7 +10133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141829</v>
+                                    <v>141830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9768,22 +10164,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1164727</cardinality>
+            <cardinality>1163672</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1164727</v>
+                    <v>1163672</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2763</cardinality>
+            <cardinality>2761</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2763</v>
+                    <v>2761</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
@@ -9801,7 +10197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2763</v>
+                                    <v>2761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9877,7 +10273,7 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29110</cardinality>
+            <cardinality>29111</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -9889,7 +10285,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28874</v>
+                    <v>28875</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9903,7 +10299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10047</v>
+                                    <v>10048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10007,7 +10403,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28637</v>
+                                    <v>28638</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10028,7 +10424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28874</v>
+                                    <v>28875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10038,19 +10434,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7317004</cardinality>
+            <cardinality>7310375</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7317004</v>
+                    <v>7310375</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7991</v>
+                    <v>7984</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3534887</v>
+                    <v>3531684</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10064,7 +10460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317004</v>
+                                    <v>7310375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10080,7 +10476,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317004</v>
+                                    <v>7310375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10096,27 +10492,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>343</a>
                                     <b>16215</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>28310</a>
@@ -10137,27 +10533,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>147</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>343</a>
                                     <b>16215</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>28310</a>
@@ -10178,27 +10574,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1508981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>977182</v>
+                                    <v>976296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>602591</v>
+                                    <v>602045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290932</v>
+                                    <v>290668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153831</v>
+                                    <v>153692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10214,27 +10610,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1508981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>977182</v>
+                                    <v>976296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>602591</v>
+                                    <v>602045</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>290932</v>
+                                    <v>290668</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>153831</v>
+                                    <v>153692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10244,27 +10640,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9398480</cardinality>
+            <cardinality>9389965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9391612</v>
+                    <v>9383104</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9042868</v>
+                    <v>9034676</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1457782</v>
+                    <v>1456461</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>853317</v>
+                    <v>852544</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6280262</v>
+                    <v>6274572</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10278,7 +10674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10294,12 +10690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9384745</v>
+                                    <v>9376243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6867</v>
+                                    <v>6861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10315,7 +10711,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10331,7 +10727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391612</v>
+                                    <v>9383104</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10347,12 +10743,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8711605</v>
+                                    <v>8703713</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>331263</v>
+                                    <v>330962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10368,12 +10764,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8989302</v>
+                                    <v>8981158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>53566</v>
+                                    <v>53517</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10389,12 +10785,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8937359</v>
+                                    <v>8929262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>105509</v>
+                                    <v>105414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10410,12 +10806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8791018</v>
+                                    <v>8783054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>251849</v>
+                                    <v>251621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10431,27 +10827,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>850695</v>
+                                    <v>849924</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>284314</v>
+                                    <v>284056</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127485</v>
+                                    <v>127370</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113251</v>
+                                    <v>113148</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2944</b>
-                                    <v>82035</v>
+                                    <v>81961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10467,27 +10863,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>871547</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>269330</v>
+                                    <v>269086</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122865</v>
+                                    <v>122754</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>113126</v>
+                                    <v>113023</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2860</b>
-                                    <v>80911</v>
+                                    <v>80838</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10503,22 +10899,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120525</v>
+                                    <v>1119510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>192789</v>
+                                    <v>192614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>115373</v>
+                                    <v>115269</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>29093</v>
+                                    <v>29066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10534,27 +10930,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>986297</v>
+                                    <v>985403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219260</v>
+                                    <v>219061</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>133728</v>
+                                    <v>133607</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>95</b>
-                                    <v>109380</v>
+                                    <v>109281</v>
                                 </b>
                                 <b>
                                     <a>97</a>
                                     <b>2622</b>
-                                    <v>9115</v>
+                                    <v>9106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10570,32 +10966,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>466365</v>
+                                    <v>465942</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165943</v>
+                                    <v>165793</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>59684</v>
+                                    <v>59630</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>65927</v>
+                                    <v>65868</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>64179</v>
+                                    <v>64121</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>27139</b>
-                                    <v>31215</v>
+                                    <v>31187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10611,32 +11007,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>479351</v>
+                                    <v>478916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165194</v>
+                                    <v>165044</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>54690</v>
+                                    <v>54640</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>71671</v>
+                                    <v>71606</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>45</b>
-                                    <v>64304</v>
+                                    <v>64246</v>
                                 </b>
                                 <b>
                                     <a>45</a>
                                     <b>26704</b>
-                                    <v>18105</v>
+                                    <v>18088</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10652,22 +11048,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>655283</v>
+                                    <v>654690</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>110878</v>
+                                    <v>110778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>65553</v>
+                                    <v>65493</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3463</b>
-                                    <v>21601</v>
+                                    <v>21581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10683,27 +11079,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494209</v>
+                                    <v>493762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>183424</v>
+                                    <v>183258</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>51693</v>
+                                    <v>51646</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>65053</v>
+                                    <v>64994</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>58935</v>
+                                    <v>58882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10719,17 +11115,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5780059</v>
+                                    <v>5774822</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>21</b>
-                                    <v>472733</v>
+                                    <v>472305</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>2943</b>
-                                    <v>27469</v>
+                                    <v>27445</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10745,12 +11141,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5860970</v>
+                                    <v>5855660</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>419291</v>
+                                    <v>418911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10766,12 +11162,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5981463</v>
+                                    <v>5976045</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>298798</v>
+                                    <v>298527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10787,12 +11183,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6267900</v>
+                                    <v>6262222</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>12361</v>
+                                    <v>12350</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10802,11 +11198,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3770380</cardinality>
+            <cardinality>3766964</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3770380</v>
+                    <v>3766964</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10824,11 +11220,11 @@
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>490339</cardinality>
+            <cardinality>489894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>490339</v>
+                    <v>489894</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10846,7 +11242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490339</v>
+                                    <v>489894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10956,19 +11352,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1634963</cardinality>
+            <cardinality>1633482</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1634963</v>
+                    <v>1633482</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1615984</v>
+                    <v>1614520</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1548807</v>
+                    <v>1547404</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10982,7 +11378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1633482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10998,7 +11394,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1633482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11014,12 +11410,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599627</v>
+                                    <v>1598177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16357</v>
+                                    <v>16342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11035,12 +11431,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599751</v>
+                                    <v>1598302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>16232</v>
+                                    <v>16217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11056,12 +11452,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526706</v>
+                                    <v>1525323</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>22100</v>
+                                    <v>22080</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11077,12 +11473,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526831</v>
+                                    <v>1525448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>64</b>
-                                    <v>21975</v>
+                                    <v>21956</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11092,22 +11488,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1096551</cardinality>
+            <cardinality>1095558</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1096551</v>
+                    <v>1095558</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>673602</cardinality>
+            <cardinality>673959</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>673602</v>
+                    <v>673959</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11118,7 +11514,7 @@
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2043</v>
+                    <v>2044</v>
                 </e>
                 <e>
                     <k>constraint</k>
@@ -11187,11 +11583,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>407321</cardinality>
+            <cardinality>407775</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -11199,11 +11595,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>407321</v>
+                    <v>407775</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11217,7 +11613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11233,7 +11629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11249,7 +11645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11308,13 +11704,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11374,13 +11770,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11440,13 +11836,13 @@
                                     <v>146</v>
                                 </b>
                                 <b>
-                                    <a>268</a>
-                                    <b>1868</b>
+                                    <a>270</a>
+                                    <b>1870</b>
                                     <v>146</v>
                                 </b>
                                 <b>
                                     <a>2205</a>
-                                    <b>12449</b>
+                                    <b>12461</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -11463,7 +11859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11479,7 +11875,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11495,7 +11891,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11511,7 +11907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11527,7 +11923,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11543,7 +11939,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407321</v>
+                                    <v>407775</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11553,15 +11949,15 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>272082</cardinality>
+            <cardinality>271973</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>272082</v>
+                    <v>271973</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>59053</v>
+                    <v>58938</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -11583,7 +11979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11599,7 +11995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11615,7 +12011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272082</v>
+                                    <v>271973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11631,7 +12027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51321</v>
+                                    <v>51206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11657,7 +12053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51321</v>
+                                    <v>51206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11683,7 +12079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59053</v>
+                                    <v>58938</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11704,12 +12100,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1954</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -11735,12 +12131,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2292</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1954</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -11780,8 +12176,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25367</a>
-                                    <b>25368</b>
+                                    <a>25356</a>
+                                    <b>25357</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -11801,8 +12197,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5377</a>
-                                    <b>5378</b>
+                                    <a>5366</a>
+                                    <b>5367</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -11834,15 +12230,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>580149</cardinality>
+            <cardinality>580049</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21895</v>
+                    <v>21874</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>272082</v>
+                    <v>271973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11871,7 +12267,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2291</v>
+                                    <v>2270</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -11907,22 +12303,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96601</v>
+                                    <v>96488</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>120282</v>
+                                    <v>120285</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20099</v>
+                                    <v>20100</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26711</v>
+                                    <v>26712</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -11937,23 +12333,23 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>173266</cardinality>
+            <cardinality>173262</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>173266</v>
+                    <v>173262</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>173266</v>
+                    <v>173262</v>
                 </e>
                 <e>
                     <k>message</k>
-                    <v>38765</v>
+                    <v>38764</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22648</v>
+                    <v>22647</v>
                 </e>
                 <e>
                     <k>enclosing</k>
@@ -11971,7 +12367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11987,7 +12383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12003,7 +12399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12019,7 +12415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12035,7 +12431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12051,7 +12447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12067,7 +12463,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12083,7 +12479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173266</v>
+                                    <v>173262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12099,7 +12495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28505</v>
+                                    <v>28504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12140,7 +12536,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28505</v>
+                                    <v>28504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12181,7 +12577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35922</v>
+                                    <v>35921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12217,7 +12613,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>1909</v>
+                                    <v>1908</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -12258,7 +12654,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4736</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12319,7 +12715,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>4736</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12391,12 +12787,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5069</v>
+                                    <v>5068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8099</v>
+                                    <v>8098</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12499,7 +12895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5857</v>
+                                    <v>5856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12545,23 +12941,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7067152</cardinality>
+            <cardinality>7060750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7026197</v>
+                    <v>7019832</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3408025</v>
+                    <v>3404938</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7991</v>
+                    <v>7984</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1221415</v>
+                    <v>1220308</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12575,7 +12971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026197</v>
+                                    <v>7019832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12591,7 +12987,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026197</v>
+                                    <v>7019832</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12607,12 +13003,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6985242</v>
+                                    <v>6978913</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40955</v>
+                                    <v>40918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12628,27 +13024,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1473177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>926272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579242</v>
+                                    <v>578717</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>281067</v>
+                                    <v>280813</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>146090</v>
+                                    <v>145958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12664,27 +13060,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1473177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>926272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579242</v>
+                                    <v>578717</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>281067</v>
+                                    <v>280813</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>146090</v>
+                                    <v>145958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12700,22 +13096,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1783301</v>
+                                    <v>1781685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1031622</v>
+                                    <v>1030688</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>437896</v>
+                                    <v>437499</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>155205</v>
+                                    <v>155064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12731,27 +13127,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>320</a>
                                     <b>15486</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>27294</a>
@@ -12772,27 +13168,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>138</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>320</a>
                                     <b>15486</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>27294</a>
@@ -12813,27 +13209,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>55</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>116</a>
                                     <b>2703</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>7497</a>
@@ -12854,27 +13250,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>738193</v>
+                                    <v>737524</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>240612</v>
+                                    <v>240394</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>93273</v>
+                                    <v>93188</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93897</v>
+                                    <v>93812</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>55439</v>
+                                    <v>55389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12890,27 +13286,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>820353</v>
+                                    <v>819610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179803</v>
+                                    <v>179640</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>106258</v>
+                                    <v>106162</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>92274</v>
+                                    <v>92190</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>2562</b>
-                                    <v>22725</v>
+                                    <v>22704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12926,17 +13322,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>996036</v>
+                                    <v>995134</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166942</v>
+                                    <v>166791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>58436</v>
+                                    <v>58383</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12946,11 +13342,11 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>159781</cardinality>
+            <cardinality>159778</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>151073</v>
+                    <v>151069</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -12968,7 +13364,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142372</v>
+                                    <v>142369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13024,19 +13420,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1499266</cardinality>
+            <cardinality>1500125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496815</v>
+                    <v>1497674</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>456075</v>
+                    <v>456185</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>641686</v>
+                    <v>642156</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13050,7 +13446,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1494473</v>
+                                    <v>1495333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13071,7 +13467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13087,22 +13483,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>338326</v>
+                                    <v>338449</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72218</v>
+                                    <v>72155</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>35401</v>
+                                    <v>35451</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>4444</b>
-                                    <v>10130</v>
+                                    <b>4445</b>
+                                    <v>10128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13118,22 +13514,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355917</v>
+                                    <v>356039</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>64321</v>
+                                    <v>64313</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>49</b>
-                                    <v>34311</v>
+                                    <v>34253</v>
                                 </b>
                                 <b>
-                                    <a>56</a>
-                                    <b>2185</b>
-                                    <v>1524</v>
+                                    <a>49</a>
+                                    <b>2186</b>
+                                    <v>1579</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13149,22 +13545,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>421164</v>
+                                    <v>421496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122542</v>
+                                    <v>122419</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>57785</v>
+                                    <v>58051</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>656</b>
-                                    <v>40193</v>
+                                    <v>40189</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13180,17 +13576,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>524318</v>
+                                    <v>524420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>72817</v>
+                                    <v>73190</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>660</b>
-                                    <v>44550</v>
+                                    <v>44545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13200,19 +13596,19 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>488591</cardinality>
+            <cardinality>488148</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>488591</v>
+                    <v>488148</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>10363</v>
+                    <v>10354</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>112626</v>
+                    <v>112524</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13226,7 +13622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488591</v>
+                                    <v>488148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13242,7 +13638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488591</v>
+                                    <v>488148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13258,7 +13654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6992</v>
+                                    <v>6986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13268,17 +13664,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>152</a>
@@ -13299,7 +13695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7117</v>
+                                    <v>7110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13309,17 +13705,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>20</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>74</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>125</a>
@@ -13340,17 +13736,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95395</v>
+                                    <v>95309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>8865</v>
+                                    <v>8857</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>604</b>
-                                    <v>8365</v>
+                                    <v>8358</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13366,12 +13762,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97018</v>
+                                    <v>96931</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15358</v>
+                                    <v>15344</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13386,19 +13782,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>726232</cardinality>
+            <cardinality>726300</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>726232</v>
+                    <v>726300</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53437</v>
+                    <v>53440</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101525</v>
+                    <v>101634</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13412,7 +13808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>726232</v>
+                                    <v>726300</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13428,7 +13824,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>726232</v>
+                                    <v>726300</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13444,37 +13840,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28883</v>
+                                    <v>28865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7837</v>
+                                    <v>7843</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4028</v>
+                                    <v>4029</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4053</v>
+                                    <v>4065</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4145</v>
+                                    <v>4133</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>165</b>
-                                    <v>4008</v>
+                                    <b>162</b>
+                                    <v>4009</v>
                                 </b>
                                 <b>
-                                    <a>165</a>
-                                    <b>19323</b>
-                                    <v>480</v>
+                                    <a>162</a>
+                                    <b>19347</b>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13490,22 +13886,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38383</v>
+                                    <v>38369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6700</v>
+                                    <v>6707</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4465</v>
+                                    <v>4478</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>3502</b>
-                                    <v>3888</v>
+                                    <b>3509</b>
+                                    <v>3885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13521,32 +13917,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62449</v>
+                                    <v>62540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16031</v>
+                                    <v>16039</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6524</v>
+                                    <v>6530</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8146</v>
+                                    <v>8147</v>
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>132</b>
-                                    <v>7617</v>
+                                    <b>134</b>
+                                    <v>7623</v>
                                 </b>
                                 <b>
-                                    <a>132</a>
-                                    <b>7547</b>
-                                    <v>756</v>
+                                    <a>134</a>
+                                    <b>7549</b>
+                                    <v>752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13562,22 +13958,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84480</v>
+                                    <v>84586</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8414</v>
+                                    <v>8411</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7677</v>
+                                    <v>7683</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>953</v>
+                                    <v>952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13587,15 +13983,15 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>229374</cardinality>
+            <cardinality>229166</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>229374</v>
+                    <v>229166</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13609,7 +14005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229374</v>
+                                    <v>229166</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13655,15 +14051,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44323</cardinality>
+            <cardinality>44324</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44323</v>
+                    <v>44324</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>41052</v>
+                    <v>41053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13677,7 +14073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44323</v>
+                                    <v>44324</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13708,19 +14104,19 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>345733</cardinality>
+            <cardinality>347816</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>345733</v>
+                    <v>347816</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41337</v>
+                    <v>41550</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>13942</v>
+                    <v>13940</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -13728,11 +14124,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>345351</v>
+                    <v>347435</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>318338</v>
+                    <v>320424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13746,7 +14142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13762,7 +14158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13778,7 +14174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13794,7 +14190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13810,7 +14206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345733</v>
+                                    <v>347816</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13831,17 +14227,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13861,22 +14257,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13897,17 +14293,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13927,22 +14323,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13958,7 +14354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41337</v>
+                                    <v>41550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13979,17 +14375,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5773</v>
+                                    <v>5772</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8714</v>
+                                    <v>8713</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5500</v>
+                                    <v>5554</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14009,22 +14405,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>2941</v>
+                                    <v>2995</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>3322</v>
+                                    <v>3430</v>
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>32</b>
-                                    <v>3104</v>
+                                    <b>33</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>32</a>
+                                    <a>33</a>
                                     <b>257</b>
-                                    <v>1361</v>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14040,7 +14436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2124</v>
+                                    <v>2123</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14050,12 +14446,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8768</v>
+                                    <v>8767</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>5446</v>
+                                    <v>5500</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14075,22 +14471,22 @@
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>3757</v>
+                                    <v>3811</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>3104</v>
+                                    <v>3212</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>123</b>
-                                    <v>3104</v>
+                                    <b>165</b>
+                                    <v>3158</v>
                                 </b>
                                 <b>
-                                    <a>164</a>
+                                    <a>256</a>
                                     <b>257</b>
-                                    <v>108</v>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14145,7 +14541,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14201,7 +14597,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14218,7 +14614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13942</v>
+                                    <v>13940</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14273,7 +14669,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>757</b>
+                                    <b>761</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14329,7 +14725,7 @@
                                 </b>
                                 <b>
                                     <a>64</a>
-                                    <b>760</b>
+                                    <b>764</b>
                                     <v>980</v>
                                 </b>
                             </bs>
@@ -14344,8 +14740,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6348</a>
-                                    <b>6349</b>
+                                    <a>6387</a>
+                                    <b>6388</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14360,8 +14756,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>759</a>
-                                    <b>760</b>
+                                    <a>763</a>
+                                    <b>764</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14392,8 +14788,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>6341</a>
-                                    <b>6342</b>
+                                    <a>6380</a>
+                                    <b>6381</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14408,8 +14804,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5845</a>
-                                    <b>5846</b>
+                                    <a>5884</a>
+                                    <b>5885</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -14426,7 +14822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14447,7 +14843,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14468,7 +14864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345351</v>
+                                    <v>347435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14484,7 +14880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>345351</v>
+                                    <v>347435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14500,7 +14896,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>344970</v>
+                                    <v>347054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14521,7 +14917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14542,7 +14938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318338</v>
+                                    <v>320424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14558,7 +14954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14579,7 +14975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318338</v>
+                                    <v>320424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14595,7 +14991,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317303</v>
+                                    <v>319389</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14610,23 +15006,23 @@
         </relation>
         <relation>
             <name>builtintypes</name>
-            <cardinality>7616</cardinality>
+            <cardinality>7609</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>7616</v>
+                    <v>7609</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>874</v>
+                    <v>873</v>
                 </e>
                 <e>
                     <k>sign</k>
@@ -14634,7 +15030,7 @@
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14648,7 +15044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14664,7 +15060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14680,7 +15076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14696,7 +15092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14712,7 +15108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14728,7 +15124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14744,7 +15140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14760,7 +15156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14776,7 +15172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14792,7 +15188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14808,7 +15204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14824,7 +15220,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14840,7 +15236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14856,7 +15252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14872,7 +15268,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7616</v>
+                                    <v>7609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15016,7 +15412,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15261,7 +15657,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15277,7 +15673,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15287,23 +15683,23 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3033685</cardinality>
+            <cardinality>3030936</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3033685</v>
+                    <v>3030936</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1461902</v>
+                    <v>1460578</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>749</v>
+                    <v>748</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1948495</v>
+                    <v>1946730</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15317,7 +15713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15333,7 +15729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15349,7 +15745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033685</v>
+                                    <v>3030936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15365,17 +15761,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345279</v>
+                                    <v>1344061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>28</b>
-                                    <v>110004</v>
+                                    <v>109905</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>4302</b>
-                                    <v>6617</v>
+                                    <v>6611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15391,7 +15787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1461902</v>
+                                    <v>1460578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15407,17 +15803,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345404</v>
+                                    <v>1344185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>28</b>
-                                    <v>109879</v>
+                                    <v>109780</v>
                                 </b>
                                 <b>
                                     <a>29</a>
                                     <b>4302</b>
-                                    <v>6617</v>
+                                    <v>6611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15556,22 +15952,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1318684</v>
+                                    <v>1317489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>375873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123365</v>
+                                    <v>123253</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>130232</v>
+                                    <v>130114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15587,22 +15983,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320182</v>
+                                    <v>1318986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>375873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121866</v>
+                                    <v>121756</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>130232</v>
+                                    <v>130114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15618,22 +16014,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320557</v>
+                                    <v>1319360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376838</v>
+                                    <v>376496</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>123614</v>
+                                    <v>123502</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>127485</v>
+                                    <v>127370</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15643,11 +16039,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2249417</cardinality>
+            <cardinality>2247379</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2249417</v>
+                    <v>2247379</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -15669,7 +16065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249417</v>
+                                    <v>2247379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15685,7 +16081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249417</v>
+                                    <v>2247379</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15769,23 +16165,23 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>80661</cardinality>
+            <cardinality>80588</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>80661</v>
+                    <v>80588</v>
                 </e>
                 <e>
                     <k>num_elements</k>
-                    <v>17855</v>
+                    <v>17839</v>
                 </e>
                 <e>
                     <k>bytesize</k>
-                    <v>20227</v>
+                    <v>20209</v>
                 </e>
                 <e>
                     <k>alignment</k>
-                    <v>624</v>
+                    <v>623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15799,7 +16195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15815,7 +16211,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15831,7 +16227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>80661</v>
+                                    <v>80588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15852,7 +16248,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10863</v>
+                                    <v>10853</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15862,17 +16258,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>42</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                                 <b>
                                     <a>56</a>
@@ -15893,12 +16289,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15908,7 +16304,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>1123</v>
+                                    <v>1122</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15924,22 +16320,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15955,12 +16351,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12736</v>
+                                    <v>12724</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -15970,17 +16366,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>17</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -16001,17 +16397,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14609</v>
+                                    <v>14595</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -16032,17 +16428,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14858</v>
+                                    <v>14845</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3371</v>
+                                    <v>3368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1623</v>
+                                    <v>1621</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -16208,15 +16604,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1762239</cardinality>
+            <cardinality>1762360</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762239</v>
+                    <v>1762360</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>838004</v>
+                    <v>838037</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16230,7 +16626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762239</v>
+                                    <v>1762360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16246,22 +16642,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662556</v>
+                                    <v>662552</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80927</v>
+                                    <v>80940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64154</v>
+                                    <v>64177</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4526</b>
-                                    <v>30366</v>
+                                    <v>30367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16271,7 +16667,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814476</cardinality>
+            <cardinality>814475</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -16279,7 +16675,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814476</v>
+                    <v>814475</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16409,7 +16805,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16425,7 +16821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16441,7 +16837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16457,7 +16853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814476</v>
+                                    <v>814475</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16719,11 +17115,11 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7960</cardinality>
+            <cardinality>7961</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7960</v>
+                    <v>7961</v>
                 </e>
                 <e>
                     <k>arg_type</k>
@@ -16735,7 +17131,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5249</v>
+                    <v>5250</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16749,7 +17145,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16765,7 +17161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16781,7 +17177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7960</v>
+                                    <v>7961</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17015,7 +17411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4087</v>
+                                    <v>4088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17035,15 +17431,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4151525</cardinality>
+            <cardinality>4151710</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4151525</v>
+                    <v>4151710</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>918510</v>
+                    <v>918534</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17061,7 +17457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151525</v>
+                                    <v>4151710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17077,7 +17473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151525</v>
+                                    <v>4151710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17093,22 +17489,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654243</v>
+                                    <v>654261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158665</v>
+                                    <v>158669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70566</v>
+                                    <v>70567</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32669</b>
-                                    <v>35034</v>
+                                    <v>35035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17124,12 +17520,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>866765</v>
+                                    <v>866789</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51744</v>
+                                    <v>51745</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17198,8 +17594,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>166844</a>
-                                    <b>166845</b>
+                                    <a>166851</a>
+                                    <b>166852</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -17281,11 +17677,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1363780</cardinality>
+            <cardinality>1363817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1363780</v>
+                    <v>1363817</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -17307,7 +17703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363780</v>
+                                    <v>1363817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17323,7 +17719,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363780</v>
+                                    <v>1363817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17517,26 +17913,26 @@
         </relation>
         <relation>
             <name>usertype_final</name>
-            <cardinality>11487</cardinality>
+            <cardinality>11477</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11487</v>
+                    <v>11477</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>usertype_uuid</name>
-            <cardinality>47628</cardinality>
+            <cardinality>47716</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>47628</v>
+                    <v>47716</v>
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47148</v>
+                    <v>47237</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17550,7 +17946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47628</v>
+                                    <v>47716</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17566,7 +17962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46669</v>
+                                    <v>46758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17581,11 +17977,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1762239</cardinality>
+            <cardinality>1762360</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762239</v>
+                    <v>1762360</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -17603,7 +17999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762239</v>
+                                    <v>1762360</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17617,8 +18013,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36900</a>
-                                    <b>36901</b>
+                                    <a>36907</a>
+                                    <b>36908</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -17634,26 +18030,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>766283</cardinality>
+            <cardinality>766287</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>766283</v>
+                    <v>766287</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27152</cardinality>
+            <cardinality>27153</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13382</v>
+                    <v>13383</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>26012</v>
+                    <v>26013</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17667,7 +18063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10219</v>
+                                    <v>10220</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17703,7 +18099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24872</v>
+                                    <v>24873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17718,15 +18114,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7859536</cardinality>
+            <cardinality>7852416</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7859536</v>
+                    <v>7852416</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6370039</v>
+                    <v>6364268</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -17744,7 +18140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859536</v>
+                                    <v>7852416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17760,7 +18156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859536</v>
+                                    <v>7852416</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17776,12 +18172,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6041648</v>
+                                    <v>6036174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>328391</v>
+                                    <v>328093</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17797,7 +18193,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6370039</v>
+                                    <v>6364268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17849,59 +18245,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>593757</cardinality>
+            <cardinality>593760</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>593757</v>
+                    <v>593760</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1124388</cardinality>
+            <cardinality>1124418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1124388</v>
+                    <v>1124418</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1346258</cardinality>
+            <cardinality>1346294</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1346258</v>
+                    <v>1346294</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>232167</cardinality>
+            <cardinality>232173</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>232167</v>
+                    <v>232173</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1126046</cardinality>
+            <cardinality>1126076</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1123004</v>
+                    <v>1123034</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71801</v>
+                    <v>71803</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17915,7 +18311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120871</v>
+                                    <v>1120901</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17936,12 +18332,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20490</v>
+                                    <v>20501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12885</v>
+                                    <v>12886</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17951,7 +18347,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4657</v>
+                                    <v>4658</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -17961,7 +18357,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5724</v>
+                                    <v>5714</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -17986,11 +18382,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2898595</cardinality>
+            <cardinality>2898672</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1367076</v>
+                    <v>1367112</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17998,7 +18394,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>822077</v>
+                    <v>822099</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18012,27 +18408,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>579347</v>
+                                    <v>579362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410278</v>
+                                    <v>410289</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251042</v>
+                                    <v>251049</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>103097</v>
+                                    <v>103100</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23310</v>
+                                    <v>23311</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18048,22 +18444,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>607886</v>
+                                    <v>607902</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>424283</v>
+                                    <v>424294</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251876</v>
+                                    <v>251883</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>83029</v>
+                                    <v>83031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18171,22 +18567,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>513703</v>
+                                    <v>513716</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167643</v>
+                                    <v>167647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>75086</v>
+                                    <v>75088</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>47</b>
-                                    <v>61736</v>
+                                    <v>61737</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -18207,17 +18603,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723795</v>
+                                    <v>723815</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79913</v>
+                                    <v>79915</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18367</v>
+                                    <v>18368</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18227,11 +18623,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>510083</cardinality>
+            <cardinality>510086</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>205811</v>
+                    <v>205812</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18239,7 +18635,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>509947</v>
+                    <v>509949</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18253,7 +18649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>155798</v>
+                                    <v>155799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18279,7 +18675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147928</v>
+                                    <v>147929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18422,7 +18818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509811</v>
+                                    <v>509813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18443,7 +18839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509947</v>
+                                    <v>509949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18453,15 +18849,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48438</cardinality>
+            <cardinality>48439</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48438</v>
+                    <v>48439</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45766</v>
+                    <v>45767</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18475,7 +18871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48438</v>
+                                    <v>48439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18491,7 +18887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45047</v>
+                                    <v>45048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18506,19 +18902,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5902897</cardinality>
+            <cardinality>5903894</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5902897</v>
+                    <v>5903894</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>276673</v>
+                    <v>276913</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5846582</v>
+                    <v>5847585</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18536,7 +18932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18552,7 +18948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18568,7 +18964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902897</v>
+                                    <v>5903894</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18584,42 +18980,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31153</v>
+                                    <v>31203</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11273</v>
+                                    <v>11272</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14922</v>
+                                    <v>14921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19988</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21785</v>
+                                    <v>21837</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21077</v>
+                                    <v>21074</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>8940</b>
-                                    <v>19879</v>
+                                    <b>8941</b>
+                                    <v>19876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18635,42 +19031,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31153</v>
+                                    <v>31203</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11273</v>
+                                    <v>11272</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>14922</v>
+                                    <v>14921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>19988</v>
+                                    <v>19931</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>12</b>
-                                    <v>21785</v>
+                                    <v>21837</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21077</v>
+                                    <v>21074</v>
                                 </b>
                                 <b>
                                     <a>28</a>
-                                    <b>8940</b>
-                                    <v>19879</v>
+                                    <b>8941</b>
+                                    <v>19876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18686,7 +19082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>276673</v>
+                                    <v>276913</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18702,12 +19098,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800887</v>
+                                    <v>5801896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45694</v>
+                                    <v>45689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18723,12 +19119,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800887</v>
+                                    <v>5801896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>45694</v>
+                                    <v>45689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18744,7 +19140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5846582</v>
+                                    <v>5847585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18758,8 +19154,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>108383</a>
-                                    <b>108384</b>
+                                    <a>108414</a>
+                                    <b>108415</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18774,8 +19170,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>5080</a>
-                                    <b>5081</b>
+                                    <a>5085</a>
+                                    <b>5086</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18790,8 +19186,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>107349</a>
-                                    <b>107350</b>
+                                    <a>107380</a>
+                                    <b>107381</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -18802,26 +19198,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1332543</cardinality>
+            <cardinality>1331336</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1332543</v>
+                    <v>1331336</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>973628</cardinality>
+            <cardinality>973633</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>973628</v>
+                    <v>973633</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>182644</v>
+                    <v>182645</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18835,7 +19231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>973628</v>
+                                    <v>973633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18851,12 +19247,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110588</v>
+                                    <v>110589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42790</v>
+                                    <v>42791</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18881,11 +19277,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2484801</cardinality>
+            <cardinality>2484813</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1453288</v>
+                    <v>1453296</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18893,7 +19289,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>298003</v>
+                    <v>298004</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18907,17 +19303,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>783011</v>
+                                    <v>783015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>413156</v>
+                                    <v>413158</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>171810</v>
+                                    <v>171811</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18938,17 +19334,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>802158</v>
+                                    <v>802162</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>411249</v>
+                                    <v>411251</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169630</v>
+                                    <v>169631</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19091,7 +19487,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174774</v>
+                                    <v>174775</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19137,7 +19533,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256813</v>
+                                    <v>256814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19157,11 +19553,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>452779</cardinality>
+            <cardinality>452781</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>196783</v>
+                    <v>196784</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19169,7 +19565,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>450087</v>
+                    <v>450090</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19183,7 +19579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151403</v>
+                                    <v>151404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19209,7 +19605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144487</v>
+                                    <v>144488</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19362,7 +19758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447396</v>
+                                    <v>447398</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19383,7 +19779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>450087</v>
+                                    <v>450090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19393,26 +19789,26 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>58685</cardinality>
+            <cardinality>58632</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>58685</v>
+                    <v>58632</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>423162</cardinality>
+            <cardinality>422779</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>423162</v>
+                    <v>422779</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>35336</v>
+                    <v>35304</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19426,7 +19822,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423162</v>
+                                    <v>422779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19442,42 +19838,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15233</v>
+                                    <v>15219</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3870</v>
+                                    <v>3867</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>2996</v>
+                                    <v>2994</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>12</b>
-                                    <v>3121</v>
+                                    <v>3118</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>31</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                                 <b>
                                     <a>32</a>
                                     <b>546</b>
-                                    <v>2746</v>
+                                    <v>2744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19487,19 +19883,19 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>769159</cardinality>
+            <cardinality>768462</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>401311</v>
+                    <v>400947</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>1997</v>
+                    <v>1996</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>256344</v>
+                    <v>256112</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19513,22 +19909,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>156703</v>
+                                    <v>156561</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189917</v>
+                                    <v>189745</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36460</v>
+                                    <v>36427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>18230</v>
+                                    <v>18213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19544,22 +19940,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171562</v>
+                                    <v>171407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180178</v>
+                                    <v>180014</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>33713</v>
+                                    <v>33682</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>17</b>
-                                    <v>15857</v>
+                                    <v>15843</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19575,7 +19971,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>29</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -19626,7 +20022,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874</v>
+                                    <v>873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19677,22 +20073,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>175558</v>
+                                    <v>175399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>44701</v>
+                                    <v>44660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>21601</v>
+                                    <v>21581</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>206</b>
-                                    <v>14484</v>
+                                    <v>14471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19708,17 +20104,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228000</v>
+                                    <v>227794</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24722</v>
+                                    <v>24700</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19728,11 +20124,11 @@
         </relation>
         <relation>
             <name>variable_template_argument_value</name>
-            <cardinality>19978</cardinality>
+            <cardinality>19960</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>14858</v>
+                    <v>14845</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19740,7 +20136,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>19978</v>
+                    <v>19960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19754,12 +20150,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13360</v>
+                                    <v>13348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1498</v>
+                                    <v>1497</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19775,12 +20171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10488</v>
+                                    <v>10479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3995</v>
+                                    <v>3992</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19863,7 +20259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19978</v>
+                                    <v>19960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19879,7 +20275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19978</v>
+                                    <v>19960</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19889,15 +20285,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>6368</cardinality>
+            <cardinality>6362</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>4994</v>
+                    <v>4990</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>1123</v>
+                    <v>1122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19911,12 +20307,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1373</v>
+                                    <v>1372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19932,7 +20328,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19957,7 +20353,7 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9674</cardinality>
+            <cardinality>9675</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -20167,7 +20563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9051</v>
+                                    <v>9052</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20455,11 +20851,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90430</cardinality>
+            <cardinality>90433</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90430</v>
+                    <v>90433</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -20477,7 +20873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90430</v>
+                                    <v>90433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20573,22 +20969,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36899</cardinality>
+            <cardinality>36900</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36899</v>
+                    <v>36900</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>113043</cardinality>
+            <cardinality>113047</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76380</v>
+                    <v>76383</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20596,7 +20992,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21429</v>
+                    <v>21430</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20610,12 +21006,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46473</v>
+                                    <v>46475</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24678</v>
+                                    <v>24679</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20636,17 +21032,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50088</v>
+                                    <v>50090</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22376</v>
+                                    <v>22377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3915</v>
+                                    <v>3916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20946,15 +21342,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>604319</cardinality>
+            <cardinality>604322</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>604319</v>
+                    <v>604322</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>283864</v>
+                    <v>283865</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20968,7 +21364,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>604319</v>
+                                    <v>604322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20984,7 +21380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234225</v>
+                                    <v>234226</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21004,11 +21400,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1176788</cardinality>
+            <cardinality>1176651</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>415119</v>
+                    <v>415070</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21016,7 +21412,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>111595</v>
+                    <v>111582</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21030,32 +21426,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82511</v>
+                                    <v>82502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126028</v>
+                                    <v>126013</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107456</v>
+                                    <v>107443</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49289</v>
+                                    <v>49283</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>33168</v>
+                                    <v>33164</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16665</v>
+                                    <v>16663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21071,27 +21467,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88502</v>
+                                    <v>88492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138663</v>
+                                    <v>138647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>114209</v>
+                                    <v>114196</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40738</v>
+                                    <v>40733</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>32895</v>
+                                    <v>32891</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -21289,42 +21685,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33222</v>
+                                    <v>33218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>15195</v>
+                                    <v>15193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>13234</v>
+                                    <v>13233</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>9803</v>
+                                    <v>9802</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>6372</v>
+                                    <v>6371</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>9476</v>
+                                    <v>9475</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>9531</v>
+                                    <v>9529</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>26</b>
-                                    <v>8659</v>
+                                    <v>8658</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -21345,22 +21741,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78917</v>
+                                    <v>78908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17537</v>
+                                    <v>17535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>9476</v>
+                                    <v>9475</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>5664</v>
+                                    <v>5663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21370,11 +21766,11 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9727</cardinality>
+            <cardinality>9728</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9727</v>
+                    <v>9728</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -21396,7 +21792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9727</v>
+                                    <v>9728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21412,7 +21808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9727</v>
+                                    <v>9728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21526,15 +21922,15 @@
         </relation>
         <relation>
             <name>specifiers</name>
-            <cardinality>7741</cardinality>
+            <cardinality>7734</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7741</v>
+                    <v>7734</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>7741</v>
+                    <v>7734</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21548,7 +21944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7741</v>
+                                    <v>7734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21564,7 +21960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7741</v>
+                                    <v>7734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21574,15 +21970,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>854940</cardinality>
+            <cardinality>854272</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>847448</v>
+                    <v>849128</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1623</v>
+                    <v>95</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21596,12 +21992,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839957</v>
+                                    <v>843984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7491</v>
+                                    <v>5143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21615,69 +22011,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>124</v>
+                                    <a>168</a>
+                                    <b>169</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>124</v>
+                                    <a>215</a>
+                                    <b>216</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>124</v>
+                                    <a>225</a>
+                                    <b>226</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>124</v>
+                                    <a>533</a>
+                                    <b>534</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
-                                    <v>124</v>
+                                    <a>821</a>
+                                    <b>822</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>199</a>
-                                    <b>200</b>
-                                    <v>124</v>
+                                    <a>1568</a>
+                                    <b>1569</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>325</a>
-                                    <b>326</b>
-                                    <v>124</v>
+                                    <a>4195</a>
+                                    <b>4196</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>545</a>
-                                    <b>546</b>
-                                    <v>124</v>
+                                    <a>18295</a>
+                                    <b>18296</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5462</a>
-                                    <b>5463</b>
-                                    <v>124</v>
+                                    <a>54858</a>
+                                    <b>54859</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21687,15 +22063,15 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9723250</cardinality>
+            <cardinality>9714441</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4012490</v>
+                    <v>4008855</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>2372</v>
+                    <v>2370</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21709,27 +22085,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1528454</v>
+                                    <v>1527070</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>506696</v>
+                                    <v>506237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1037865</v>
+                                    <v>1036925</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>693492</v>
+                                    <v>692863</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>245981</v>
+                                    <v>245758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21845,15 +22221,15 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078136</cardinality>
+            <cardinality>3075347</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2316968</v>
+                    <v>2314869</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1123</v>
+                    <v>1122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21867,17 +22243,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1659561</v>
+                                    <v>1658058</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>554144</v>
+                                    <v>553642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>103262</v>
+                                    <v>103168</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21943,15 +22319,15 @@
         </relation>
         <relation>
             <name>explicit_specifier_exprs</name>
-            <cardinality>41329</cardinality>
+            <cardinality>41292</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>41329</v>
+                    <v>41292</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>41329</v>
+                    <v>41292</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21965,7 +22341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21981,7 +22357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21991,11 +22367,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>654409</cardinality>
+            <cardinality>653817</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>654409</v>
+                    <v>653817</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -22003,7 +22379,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2122</v>
+                    <v>2120</v>
                 </e>
                 <e>
                     <k>name_space</k>
@@ -22011,7 +22387,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>648291</v>
+                    <v>647704</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22025,7 +22401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22041,7 +22417,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22057,7 +22433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22073,7 +22449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>653817</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22269,7 +22645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22290,7 +22666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22476,12 +22852,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642423</v>
+                                    <v>641841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5868</v>
+                                    <v>5863</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22497,7 +22873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648291</v>
+                                    <v>647704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22513,12 +22889,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643172</v>
+                                    <v>642589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5119</v>
+                                    <v>5114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22534,7 +22910,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648291</v>
+                                    <v>647704</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23243,15 +23619,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71875</cardinality>
+            <cardinality>71856</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71875</v>
+                    <v>71856</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71875</v>
+                    <v>71856</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23265,7 +23641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71875</v>
+                                    <v>71856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23281,7 +23657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71875</v>
+                                    <v>71856</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23392,15 +23768,15 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>96394</cardinality>
+            <cardinality>96307</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>94646</v>
+                    <v>94560</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>32464</v>
+                    <v>32435</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23414,12 +23790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92898</v>
+                                    <v>92814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1748</v>
+                                    <v>1746</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23435,17 +23811,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27969</v>
+                                    <v>27944</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>58</b>
-                                    <v>1997</v>
+                                    <v>1996</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23455,15 +23831,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>844327</cardinality>
+            <cardinality>843562</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>799751</v>
+                    <v>799026</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>617325</v>
+                    <v>616766</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23477,12 +23853,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>759669</v>
+                                    <v>758981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>40081</v>
+                                    <v>40044</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23498,12 +23874,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>572249</v>
+                                    <v>571731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>213</b>
-                                    <v>45075</v>
+                                    <v>45034</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23702,15 +24078,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7179404</cardinality>
+            <cardinality>7172900</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7179404</v>
+                    <v>7172900</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3965916</v>
+                    <v>3962323</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23724,7 +24100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7179404</v>
+                                    <v>7172900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23740,22 +24116,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2482787</v>
+                                    <v>2480537</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1117778</v>
+                                    <v>1116765</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>302918</v>
+                                    <v>302644</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>537</b>
-                                    <v>62431</v>
+                                    <v>62375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23765,19 +24141,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4193417</cardinality>
+            <cardinality>4189618</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>543780</v>
+                    <v>543288</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29717</v>
+                    <v>29690</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4188797</v>
+                    <v>4185003</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23791,57 +24167,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129108</v>
+                                    <v>128991</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83408</v>
+                                    <v>83333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32464</v>
+                                    <v>32435</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44950</v>
+                                    <v>44910</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42453</v>
+                                    <v>42415</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>33962</v>
+                                    <v>33932</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42328</v>
+                                    <v>42290</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41204</v>
+                                    <v>41167</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41329</v>
+                                    <v>41292</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40830</v>
+                                    <v>40793</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>239</b>
-                                    <v>11737</v>
+                                    <v>11726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23857,57 +24233,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>128859</v>
+                                    <v>128742</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83533</v>
+                                    <v>83458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>32214</v>
+                                    <v>32185</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>45075</v>
+                                    <v>45034</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42578</v>
+                                    <v>42539</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>32839</v>
+                                    <v>32809</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>42703</v>
+                                    <v>42664</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>13</b>
-                                    <v>41579</v>
+                                    <v>41541</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>18</b>
-                                    <v>41454</v>
+                                    <v>41417</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>42</b>
-                                    <v>40955</v>
+                                    <v>40918</v>
                                 </b>
                                 <b>
                                     <a>42</a>
                                     <b>265</b>
-                                    <v>11986</v>
+                                    <v>11976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23923,57 +24299,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6492</v>
+                                    <v>6487</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2622</v>
+                                    <v>2619</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>26</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>36</b>
-                                    <v>2497</v>
+                                    <v>2495</v>
                                 </b>
                                 <b>
                                     <a>36</a>
                                     <b>50</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>54</a>
                                     <b>141</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>150</a>
                                     <b>468</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>480</a>
                                     <b>4310</b>
-                                    <v>2122</v>
+                                    <v>2120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23989,57 +24365,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5493</v>
+                                    <v>5489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3621</v>
+                                    <v>3617</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>2871</v>
+                                    <v>2869</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>20</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>28</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>37</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>37</a>
                                     <b>56</b>
-                                    <v>2372</v>
+                                    <v>2370</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>156</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>163</a>
                                     <b>527</b>
-                                    <v>2247</v>
+                                    <v>2245</v>
                                 </b>
                                 <b>
                                     <a>547</a>
                                     <b>4330</b>
-                                    <v>1872</v>
+                                    <v>1871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24055,7 +24431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4188797</v>
+                                    <v>4185003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24071,12 +24447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4184177</v>
+                                    <v>4180387</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4619</v>
+                                    <v>4615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24094,7 +24470,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>71340</v>
+                    <v>71341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24149,15 +24525,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>476900</cardinality>
+            <cardinality>476902</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>476900</v>
+                    <v>476902</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>455164</v>
+                    <v>455166</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24165,11 +24541,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>235554</v>
+                    <v>235555</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35397</v>
+                    <v>35398</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24183,7 +24559,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24199,7 +24575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24215,7 +24591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24231,7 +24607,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24247,7 +24623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24268,7 +24644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24289,7 +24665,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24310,7 +24686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24470,7 +24846,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24491,7 +24867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24512,7 +24888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235111</v>
+                                    <v>235112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24533,7 +24909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230205</v>
+                                    <v>230206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24626,7 +25002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35397</v>
+                                    <v>35398</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24667,11 +25043,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>478671</cardinality>
+            <cardinality>478674</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>476457</v>
+                    <v>476459</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24689,7 +25065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>474242</v>
+                                    <v>474245</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24735,11 +25111,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>449985</cardinality>
+            <cardinality>449987</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>449985</v>
+                    <v>449987</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -24757,7 +25133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449985</v>
+                                    <v>449987</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24954,11 +25330,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>700462</cardinality>
+            <cardinality>700465</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>700462</v>
+                    <v>700465</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -24984,7 +25360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700462</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25000,358 +25376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700462</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>700462</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>type_id</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6166</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13968</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>3577</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>3440</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>20</b>
-                                    <v>3645</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>32</b>
-                                    <v>3304</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>50</b>
-                                    <v>3781</v>
-                                </b>
-                                <b>
-                                    <a>50</a>
-                                    <b>80</b>
-                                    <v>3781</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>120</b>
-                                    <v>749</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>type_id</src>
-                    <trg>decl_id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>6166</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>13968</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>3577</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>12</b>
-                                    <v>3440</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>20</b>
-                                    <v>3645</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>32</b>
-                                    <v>3304</v>
-                                </b>
-                                <b>
-                                    <a>33</a>
-                                    <b>50</b>
-                                    <v>3781</v>
-                                </b>
-                                <b>
-                                    <a>50</a>
-                                    <b>80</b>
-                                    <v>3781</v>
-                                </b>
-                                <b>
-                                    <a>101</a>
-                                    <b>120</b>
-                                    <v>749</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>type_id</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>41053</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>13</b>
-                                    <v>1362</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>decl_id</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>48071</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5962</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>8</b>
-                                    <v>5996</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>6064</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>40</b>
-                                    <v>6064</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>164</b>
-                                    <v>5689</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>decl_id</src>
-                    <trg>type_id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>48071</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>5962</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>8</b>
-                                    <v>5996</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>15</b>
-                                    <v>6064</v>
-                                </b>
-                                <b>
-                                    <a>15</a>
-                                    <b>40</b>
-                                    <v>6064</v>
-                                </b>
-                                <b>
-                                    <a>40</a>
-                                    <b>164</b>
-                                    <v>5689</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>decl_id</src>
-                    <trg>location</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>77166</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>5</b>
-                                    <v>681</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5723</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>20371</b>
-                                    <v>374</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>type_id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5962</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>1148</b>
-                                    <v>136</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>location</src>
-                    <trg>decl_id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>5757</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>2132</b>
-                                    <v>340</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>comments</name>
-            <cardinality>11241965</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>11241965</v>
-                </e>
-                <e>
-                    <k>contents</k>
-                    <v>4306669</v>
-                </e>
-                <e>
-                    <k>location</k>
-                    <v>11241965</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>contents</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11241965</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25367,14 +25392,14 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>700465</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>contents</src>
+                    <src>type_id</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -25383,17 +25408,368 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932328</v>
+                                    <v>6166</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>13968</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>7</b>
+                                    <v>3577</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>12</b>
+                                    <v>3441</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>3645</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>32</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>3781</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>80</b>
+                                    <v>3781</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>120</b>
+                                    <v>749</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>decl_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
+                                    <b>3</b>
+                                    <v>13968</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
                                     <b>7</b>
-                                    <v>330014</v>
+                                    <v>3577</v>
                                 </b>
                                 <b>
                                     <a>7</a>
+                                    <b>12</b>
+                                    <v>3441</v>
+                                </b>
+                                <b>
+                                    <a>12</a>
+                                    <b>20</b>
+                                    <v>3645</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>32</b>
+                                    <v>3304</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>50</b>
+                                    <v>3781</v>
+                                </b>
+                                <b>
+                                    <a>50</a>
+                                    <b>80</b>
+                                    <v>3781</v>
+                                </b>
+                                <b>
+                                    <a>101</a>
+                                    <b>120</b>
+                                    <v>749</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>type_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>41053</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>13</b>
+                                    <v>1362</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>48071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5962</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>5996</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>6064</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>40</b>
+                                    <v>6064</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>164</b>
+                                    <v>5689</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>48071</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>5962</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>5996</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>15</b>
+                                    <v>6064</v>
+                                </b>
+                                <b>
+                                    <a>15</a>
+                                    <b>40</b>
+                                    <v>6064</v>
+                                </b>
+                                <b>
+                                    <a>40</a>
+                                    <b>164</b>
+                                    <v>5689</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>decl_id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>77167</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>5</b>
+                                    <v>681</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5723</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>20371</b>
+                                    <v>374</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>type_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5962</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>1148</b>
+                                    <v>136</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>location</src>
+                    <trg>decl_id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>5757</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>2132</b>
+                                    <v>340</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>comments</name>
+            <cardinality>11233402</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>11233402</v>
+                </e>
+                <e>
+                    <k>contents</k>
+                    <v>4303640</v>
+                </e>
+                <e>
+                    <k>location</k>
+                    <v>11233402</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>contents</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11233402</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>location</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>11233402</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>contents</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3928890</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>6</b>
+                                    <v>322978</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
                                     <b>34447</b>
-                                    <v>44326</v>
+                                    <v>51771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25409,17 +25785,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932328</v>
+                                    <v>3928890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>7</b>
-                                    <v>330014</v>
+                                    <b>6</b>
+                                    <v>322978</v>
                                 </b>
                                 <b>
-                                    <a>7</a>
+                                    <a>6</a>
                                     <b>34447</b>
-                                    <v>44326</v>
+                                    <v>51771</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25435,7 +25811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25451,7 +25827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241965</v>
+                                    <v>11233402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25461,15 +25837,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3916720</cardinality>
+            <cardinality>3914793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3352211</v>
+                    <v>3350796</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3751026</v>
+                    <v>3749249</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25483,12 +25859,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3290529</v>
+                                    <v>3289170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1706</b>
-                                    <v>61682</v>
+                                    <v>61626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25504,12 +25880,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3585332</v>
+                                    <v>3583705</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165693</v>
+                                    <v>165543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25519,15 +25895,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9633088</cardinality>
+            <cardinality>9633084</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9632982</v>
+                    <v>9632979</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9633088</v>
+                    <v>9633084</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25541,7 +25917,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9632877</v>
+                                    <v>9632873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25562,7 +25938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633088</v>
+                                    <v>9633084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25572,22 +25948,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9891529</cardinality>
+            <cardinality>9892394</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9891529</v>
+                    <v>9892394</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1671638</cardinality>
+            <cardinality>1671701</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1244918</v>
+                    <v>1244965</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -25595,7 +25971,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1671638</v>
+                    <v>1671701</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25609,17 +25985,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828654</v>
+                                    <v>828685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409464</v>
+                                    <v>409480</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6798</v>
+                                    <v>6799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25635,17 +26011,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828654</v>
+                                    <v>828685</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409464</v>
+                                    <v>409480</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6798</v>
+                                    <v>6799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25793,7 +26169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671638</v>
+                                    <v>1671701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25809,7 +26185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671638</v>
+                                    <v>1671701</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25888,15 +26264,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2039521</cardinality>
+            <cardinality>2037673</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>3995</v>
+                    <v>3992</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2039521</v>
+                    <v>2037673</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25925,7 +26301,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>624</v>
+                                    <v>623</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25986,7 +26362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2039521</v>
+                                    <v>2037673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25996,11 +26372,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19454218</cardinality>
+            <cardinality>19454210</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19454218</v>
+                    <v>19454210</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26008,7 +26384,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12939988</v>
+                    <v>12939983</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26022,7 +26398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454218</v>
+                                    <v>19454210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26038,7 +26414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454218</v>
+                                    <v>19454210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26156,12 +26532,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394757</v>
+                                    <v>7394754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082680</v>
+                                    <v>5082678</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26182,12 +26558,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394757</v>
+                                    <v>7394754</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082680</v>
+                                    <v>5082678</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26202,22 +26578,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6909475</cardinality>
+            <cardinality>6909332</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6909475</v>
+                    <v>6909332</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6050433</cardinality>
+            <cardinality>6050443</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6050433</v>
+                    <v>6050443</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26235,7 +26611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6050433</v>
+                                    <v>6050443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26259,8 +26635,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>7362</a>
-                                    <b>7363</b>
+                                    <a>7371</a>
+                                    <b>7372</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -26279,8 +26655,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5831534</a>
-                                    <b>5831535</b>
+                                    <a>5831535</a>
+                                    <b>5831536</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -26291,11 +26667,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5802603</cardinality>
+            <cardinality>5802824</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5802603</v>
+                    <v>5802824</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -26313,7 +26689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5802603</v>
+                                    <v>5802824</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26349,11 +26725,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>627938</cardinality>
+            <cardinality>627369</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>627938</v>
+                    <v>627369</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -26371,7 +26747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>627938</v>
+                                    <v>627369</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26455,23 +26831,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3041863</cardinality>
+            <cardinality>3041979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3041863</v>
+                    <v>3041979</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3041863</v>
+                    <v>3041979</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47485</v>
+                    <v>47486</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>552436</v>
+                    <v>552457</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26485,7 +26861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26501,7 +26877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26517,7 +26893,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26533,7 +26909,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26549,7 +26925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26565,7 +26941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3041863</v>
+                                    <v>3041979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26581,12 +26957,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31541</v>
+                                    <v>31543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8175</v>
+                                    <v>8176</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26617,12 +26993,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31541</v>
+                                    <v>31543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8175</v>
+                                    <v>8176</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26653,7 +27029,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34403</v>
+                                    <v>34404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26684,22 +27060,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79134</v>
+                                    <v>79137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38104</v>
+                                    <v>38105</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398986</v>
+                                    <v>399001</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36210</v>
+                                    <v>36212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26715,22 +27091,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79134</v>
+                                    <v>79137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38104</v>
+                                    <v>38105</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398986</v>
+                                    <v>399001</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36210</v>
+                                    <v>36212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26746,22 +27122,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>111537</v>
+                                    <v>111541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13296</v>
+                                    <v>13297</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>415295</v>
+                                    <v>415311</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>12306</v>
+                                    <v>12307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26771,15 +27147,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8254632</cardinality>
+            <cardinality>8254629</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8254632</v>
+                    <v>8254629</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050376</v>
+                    <v>1050375</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26793,7 +27169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8254632</v>
+                                    <v>8254629</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26829,7 +27205,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83151</v>
+                                    <v>83150</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26864,15 +27240,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5812199</cardinality>
+            <cardinality>5812528</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5809833</v>
+                    <v>5810054</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275916</v>
+                    <v>275948</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26886,12 +27262,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5807466</v>
+                                    <v>5807579</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2366</v>
+                                    <v>2474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26907,27 +27283,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181420</v>
+                                    <v>181448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38835</v>
+                                    <v>38837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17212</v>
+                                    <v>17191</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22720</v>
+                                    <v>22742</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15727</v>
+                                    <v>15728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26937,11 +27313,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>45243</cardinality>
+            <cardinality>45244</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45243</v>
+                    <v>45244</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -26963,7 +27339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26979,7 +27355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27210,15 +27586,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897880</cardinality>
+            <cardinality>897879</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27232,7 +27608,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27248,7 +27624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27306,15 +27682,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897880</cardinality>
+            <cardinality>897879</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897880</v>
+                    <v>897879</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27328,7 +27704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27344,7 +27720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897880</v>
+                                    <v>897879</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27354,11 +27730,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13474606</cardinality>
+            <cardinality>13474601</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13474606</v>
+                    <v>13474601</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -27376,7 +27752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13474606</v>
+                                    <v>13474601</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27422,11 +27798,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647578</cardinality>
+            <cardinality>6647456</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647578</v>
+                    <v>6647456</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -27444,7 +27820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647578</v>
+                                    <v>6647456</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27485,15 +27861,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13583189</cardinality>
+            <cardinality>13583183</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13474606</v>
+                    <v>13474601</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13583189</v>
+                    <v>13583183</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27507,7 +27883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13384052</v>
+                                    <v>13384046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27528,7 +27904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13583189</v>
+                                    <v>13583183</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27538,15 +27914,15 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1496815</cardinality>
+            <cardinality>1497674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496815</v>
+                    <v>1497674</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
-                    <v>31370</v>
+                    <v>31367</v>
                 </e>
                 <e>
                     <k>bitoffset</k>
@@ -27564,7 +27940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27580,7 +27956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496815</v>
+                                    <v>1497674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27596,7 +27972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17700</v>
+                                    <v>17698</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27611,7 +27987,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>2614</v>
+                                    <v>2613</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -27625,7 +28001,7 @@
                                 </b>
                                 <b>
                                     <a>250</a>
-                                    <b>5947</b>
+                                    <b>5950</b>
                                     <v>1089</v>
                                 </b>
                             </bs>
@@ -27642,7 +28018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30390</v>
+                                    <v>30386</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27696,8 +28072,8 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>27127</a>
-                                    <b>27128</b>
+                                    <a>27146</a>
+                                    <b>27147</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -27739,19 +28115,19 @@
         </relation>
         <relation>
             <name>bitfield</name>
-            <cardinality>30341</cardinality>
+            <cardinality>30314</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30341</v>
+                    <v>30314</v>
                 </e>
                 <e>
                     <k>bits</k>
-                    <v>3496</v>
+                    <v>3493</v>
                 </e>
                 <e>
                     <k>declared_bits</k>
-                    <v>3496</v>
+                    <v>3493</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27765,7 +28141,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30341</v>
+                                    <v>30314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27781,7 +28157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30341</v>
+                                    <v>30314</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27802,7 +28178,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27848,7 +28224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27869,7 +28245,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>749</v>
+                                    <v>748</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27915,7 +28291,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3496</v>
+                                    <v>3493</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27925,23 +28301,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2251035</cardinality>
+            <cardinality>2251321</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2251035</v>
+                    <v>2251321</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>980971</v>
+                    <v>981178</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2251035</v>
+                    <v>2251321</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>516371</v>
+                    <v>516961</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27955,7 +28331,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27971,7 +28347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27987,7 +28363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28003,17 +28379,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37441</v>
+                                    <v>37448</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72973</v>
+                                    <v>72972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28029,17 +28405,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870758</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>37441</v>
+                                    <v>37448</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72973</v>
+                                    <v>72972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28055,7 +28431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>980963</v>
+                                    <v>981170</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28076,7 +28452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28092,7 +28468,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28108,7 +28484,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251035</v>
+                                    <v>2251321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28124,22 +28500,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414356</v>
+                                    <v>415111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>42250</v>
+                                    <v>42070</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111911</b>
-                                    <v>26157</v>
+                                    <b>111925</b>
+                                    <v>26165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28155,17 +28531,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443657</v>
+                                    <v>444412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34516</v>
+                                    <v>34524</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>12237</b>
-                                    <v>38196</v>
+                                    <b>12238</b>
+                                    <v>38025</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28181,22 +28557,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414356</v>
+                                    <v>415111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>42250</v>
+                                    <v>42070</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>111911</b>
-                                    <v>26157</v>
+                                    <b>111925</b>
+                                    <v>26165</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28206,26 +28582,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>68468</cardinality>
+            <cardinality>68438</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>68468</v>
+                    <v>68438</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1677619</cardinality>
+            <cardinality>1677683</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1677619</v>
+                    <v>1677683</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>839627</v>
+                    <v>839659</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28239,7 +28615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1677619</v>
+                                    <v>1677683</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28255,12 +28631,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17083</v>
+                                    <v>17084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>812474</v>
+                                    <v>812505</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28275,11 +28651,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25210577</cardinality>
+            <cardinality>25210567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210577</v>
+                    <v>25210567</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28287,7 +28663,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10582671</v>
+                    <v>10585854</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28301,7 +28677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28317,7 +28693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28477,8 +28853,8 @@
                                     <v>109</v>
                                 </b>
                                 <b>
-                                    <a>224080</a>
-                                    <b>224081</b>
+                                    <a>224225</a>
+                                    <b>224226</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -28495,7 +28871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8900701</v>
+                                    <v>8903885</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28505,7 +28881,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>797199</v>
+                                    <v>797198</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -28526,12 +28902,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9040103</v>
+                                    <v>9043287</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774273</v>
+                                    <v>774272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28546,15 +28922,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>847007</cardinality>
+            <cardinality>847039</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>847007</v>
+                    <v>847039</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>847007</v>
+                    <v>847039</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -28572,7 +28948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28588,7 +28964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28604,7 +28980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28620,7 +28996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847007</v>
+                                    <v>847039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28672,11 +29048,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25210577</cardinality>
+            <cardinality>25210567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210577</v>
+                    <v>25210567</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -28698,7 +29074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28714,7 +29090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210577</v>
+                                    <v>25210567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28859,11 +29235,11 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>46197</cardinality>
+            <cardinality>46198</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46197</v>
+                    <v>46198</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -28881,7 +29257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46197</v>
+                                    <v>46198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30316,15 +30692,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>408905</cardinality>
+            <cardinality>408920</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>408905</v>
+                    <v>408920</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>408905</v>
+                    <v>408920</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30338,7 +30714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408905</v>
+                                    <v>408920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30354,7 +30730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408905</v>
+                                    <v>408920</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30422,15 +30798,15 @@
         </relation>
         <relation>
             <name>uuidof_bind</name>
-            <cardinality>26588</cardinality>
+            <cardinality>26677</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>26588</v>
+                    <v>26677</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>26336</v>
+                    <v>26425</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30444,7 +30820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26588</v>
+                                    <v>26677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30460,7 +30836,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26125</v>
+                                    <v>26214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30475,11 +30851,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>242027</cardinality>
+            <cardinality>242026</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>242027</v>
+                    <v>242026</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -30497,7 +30873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242027</v>
+                                    <v>242026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30852,11 +31228,11 @@
         </relation>
         <relation>
             <name>lambda_capture</name>
-            <cardinality>31966</cardinality>
+            <cardinality>31965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31966</v>
+                    <v>31965</v>
                 </e>
                 <e>
                     <k>lambda</k>
@@ -30868,7 +31244,7 @@
                 </e>
                 <e>
                     <k>field</k>
-                    <v>31966</v>
+                    <v>31965</v>
                 </e>
                 <e>
                     <k>captured_by_reference</k>
@@ -30894,7 +31270,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30910,7 +31286,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30926,7 +31302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30942,7 +31318,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30958,7 +31334,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30974,7 +31350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31602,7 +31978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31618,7 +31994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31634,7 +32010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31650,7 +32026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31666,7 +32042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31682,7 +32058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31966</v>
+                                    <v>31965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31992,7 +32368,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17254</v>
+                                    <v>17253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32196,11 +32572,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6368968</cardinality>
+            <cardinality>6368836</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6368968</v>
+                    <v>6368836</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -32208,7 +32584,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2684538</v>
+                    <v>2684483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32222,7 +32598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368968</v>
+                                    <v>6368836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32238,7 +32614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368968</v>
+                                    <v>6368836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32476,22 +32852,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2225039</v>
+                                    <v>2224993</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182234</v>
+                                    <v>182231</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>10</b>
-                                    <v>202178</v>
+                                    <v>202173</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>1789</b>
-                                    <v>75085</v>
+                                    <v>75084</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32507,12 +32883,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2601581</v>
+                                    <v>2601527</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>82957</v>
+                                    <v>82955</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32725,15 +33101,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>437090</cardinality>
+            <cardinality>437107</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>437090</v>
+                    <v>437107</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>437090</v>
+                    <v>437107</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32747,7 +33123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437090</v>
+                                    <v>437107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32763,7 +33139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437090</v>
+                                    <v>437107</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32821,15 +33197,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>106134</cardinality>
+            <cardinality>106037</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>106134</v>
+                    <v>106037</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>106134</v>
+                    <v>106037</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32843,7 +33219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106134</v>
+                                    <v>106037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32859,7 +33235,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106134</v>
+                                    <v>106037</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32869,15 +33245,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>76166</cardinality>
+            <cardinality>76097</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>76166</v>
+                    <v>76097</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>76166</v>
+                    <v>76097</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32891,7 +33267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76166</v>
+                                    <v>76097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32907,7 +33283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76166</v>
+                                    <v>76097</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33157,11 +33533,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>836120</cardinality>
+            <cardinality>836152</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33169,7 +33545,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>836120</v>
+                    <v>836152</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33188,7 +33564,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408969</v>
+                                    <v>408985</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33214,7 +33590,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408969</v>
+                                    <v>408985</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33377,7 +33753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836120</v>
+                                    <v>836152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33393,7 +33769,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836120</v>
+                                    <v>836152</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33403,15 +33779,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>411852</cardinality>
+            <cardinality>411868</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>411852</v>
+                    <v>411868</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33425,7 +33801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411852</v>
+                                    <v>411868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33441,7 +33817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411852</v>
+                                    <v>411868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33643,11 +34019,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5628380</cardinality>
+            <cardinality>5628263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5628380</v>
+                    <v>5628263</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -33655,7 +34031,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2381490</v>
+                    <v>2381441</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33669,7 +34045,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628380</v>
+                                    <v>5628263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33685,7 +34061,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628380</v>
+                                    <v>5628263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33721,7 +34097,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1316</v>
+                                    <v>1315</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -33782,7 +34158,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>1316</v>
+                                    <v>1315</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -33823,27 +34199,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1358987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>517378</v>
+                                    <v>517368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151519</v>
+                                    <v>151516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155727</v>
+                                    <v>155724</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178871</v>
+                                    <v>178868</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -33864,27 +34240,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1358987</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>517378</v>
+                                    <v>517368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151519</v>
+                                    <v>151516</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155727</v>
+                                    <v>155724</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>178871</v>
+                                    <v>178868</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -33899,22 +34275,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43746</cardinality>
+            <cardinality>43781</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43746</v>
+                    <v>43781</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>725885</cardinality>
+            <cardinality>725870</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>715316</v>
+                    <v>715301</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -33922,7 +34298,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>725885</v>
+                    <v>725870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33936,7 +34312,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33957,7 +34333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34090,7 +34466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34106,7 +34482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34116,11 +34492,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>725885</cardinality>
+            <cardinality>725870</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>715316</v>
+                    <v>715301</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34128,7 +34504,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>725885</v>
+                    <v>725870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34142,7 +34518,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34163,7 +34539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707836</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34296,7 +34672,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34312,7 +34688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725885</v>
+                                    <v>725870</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34322,15 +34698,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1644952</cardinality>
+            <cardinality>1644335</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1644952</v>
+                    <v>1644335</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1428064</v>
+                    <v>1427145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34344,7 +34720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1644952</v>
+                                    <v>1644335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34360,17 +34736,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1295584</v>
+                                    <v>1294535</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>117122</v>
+                                    <v>117265</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>28</b>
-                                    <v>15358</v>
+                                    <b>29</b>
+                                    <v>15344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34561,19 +34937,19 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5413334</cardinality>
+            <cardinality>5408430</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5413334</v>
+                    <v>5408430</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>1373</v>
+                    <v>1372</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5410088</v>
+                    <v>5405187</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34587,7 +34963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413334</v>
+                                    <v>5408430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34603,7 +34979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413334</v>
+                                    <v>5408430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34751,7 +35127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409963</v>
+                                    <v>5405062</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -34772,7 +35148,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5410088</v>
+                                    <v>5405187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34782,15 +35158,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1142251</cardinality>
+            <cardinality>1141217</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>889777</v>
+                    <v>888971</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1142251</v>
+                    <v>1141217</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34804,17 +35180,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>650164</v>
+                                    <v>649575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>230622</v>
+                                    <v>230414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>8990</v>
+                                    <v>8982</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34830,7 +35206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142251</v>
+                                    <v>1141217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34840,41 +35216,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>439769</cardinality>
+            <cardinality>439371</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>439769</v>
+                    <v>439371</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>285562</cardinality>
+            <cardinality>285304</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>285562</v>
+                    <v>285304</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4356364</cardinality>
+            <cardinality>4352418</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4356364</v>
+                    <v>4352418</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2957767</v>
+                    <v>2955088</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1684908</v>
+                    <v>1683382</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34888,7 +35264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4352418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34904,7 +35280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4352418</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34920,12 +35296,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2758985</v>
+                                    <v>2756485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>198782</v>
+                                    <v>198602</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34941,12 +35317,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2876481</v>
+                                    <v>2873875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>81286</v>
+                                    <v>81212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34962,17 +35338,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536570</v>
+                                    <v>1535178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>127360</v>
+                                    <v>127245</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>13606</b>
-                                    <v>20977</v>
+                                    <v>20958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34988,17 +35364,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1540816</v>
+                                    <v>1539420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>126986</v>
+                                    <v>126871</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>17106</v>
+                                    <v>17090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35008,15 +35384,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>318629</cardinality>
+            <cardinality>318638</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>318629</v>
+                    <v>318638</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58694</v>
+                    <v>58695</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35030,7 +35406,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318629</v>
+                                    <v>318638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35134,11 +35510,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30398086</cardinality>
+            <cardinality>30398238</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3866101</v>
+                    <v>3866121</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -35156,7 +35532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>530457</v>
+                                    <v>530459</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35166,7 +35542,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3308696</v>
+                                    <v>3308712</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme
new file mode 100644
index 000000000000..5340d6d5f428
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/old.dbscheme
@@ -0,0 +1,2423 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * 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);
+
+/*- 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
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..c16b29b27f71
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/semmlecode.cpp.dbscheme
@@ -0,0 +1,2436 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * 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);
+
+/*- 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
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties
new file mode 100644
index 000000000000..d8e09e944fe5
--- /dev/null
+++ b/cpp/ql/lib/upgrades/5340d6d5f428557632b1a50113e406430f29ef7d/upgrade.properties
@@ -0,0 +1,2 @@
+description: Link PCH creations and uses
+compatibility: backwards
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index e3c013b76c75..eb805dc1af6e 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.4.7
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
 ## 1.4.6
 
 ### Minor Analysis Improvements
diff --git a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
index 1098656f7a20..9119f5271fe6 100644
--- a/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
+++ b/cpp/ql/src/Security/CWE/CWE-078/ExecTainted.ql
@@ -147,8 +147,8 @@ module ExecTaintConfig implements DataFlow::StateConfigSig {
 
   predicate isBarrier(DataFlow::Node node) { isBarrierImpl(node) }
 
-  predicate isBarrierOut(DataFlow::Node node) {
-    isSink(node, _) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
+  predicate isBarrierOut(DataFlow::Node node, FlowState state) {
+    isSink(node, state) // Prevent duplicates along a call chain, since `shellCommand` will include wrappers
   }
 
   predicate observeDiffInformedIncrementalMode() { any() }
diff --git a/cpp/ql/src/change-notes/released/1.4.7.md b/cpp/ql/src/change-notes/released/1.4.7.md
new file mode 100644
index 000000000000..d3b9a12c7984
--- /dev/null
+++ b/cpp/ql/src/change-notes/released/1.4.7.md
@@ -0,0 +1,5 @@
+## 1.4.7
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 3b00bbce928c..163362bd6321 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.6
+lastReleaseVersion: 1.4.7
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index bd7ff423c7cb..aaa6ceb2e931 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.4.6
+version: 1.4.7
 groups:
   - cpp
   - queries
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
index 105212ccca67..63528d712c0c 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/dispatch.cpp
@@ -8,7 +8,7 @@ struct Top {
   virtual void isSink(int x) { }
   virtual int notSource1() { return source(); }
   virtual int notSource2() { return source(); }
-  virtual void notSink(int x) { sink(x); } // $ SPURIOUS: ast,ir=37:19 ast,ir=45:18
+  virtual void notSink(int x) { sink(x); } // $ SPURIOUS: ast=37:19 ast=45:18
 };
 
 // This class has the correct behavior for just the functions ending in 2.
@@ -32,16 +32,16 @@ void VirtualDispatch(Bottom *bottomPtr, Bottom &bottomRef) { // $ ast-def=bottom
   sink(topPtr->isSource2()); // $ ir MISSING: ast
   topPtr->isSink(source()); // causing a MISSING for ast
 
-  sink(topPtr->notSource1()); // $ SPURIOUS: ast,ir
-  sink(topPtr->notSource2()); // $ SPURIOUS: ast,ir
+  sink(topPtr->notSource1()); // $ SPURIOUS: ast
+  sink(topPtr->notSource2()); // $ SPURIOUS: ast
   topPtr->notSink(source()); // causing SPURIOUS for ast,ir
 
   sink(topRef.isSource1()); // $ ir MISSING: ast
   sink(topRef.isSource2()); // $ ir MISSING: ast
   topRef.isSink(source()); // causing a MISSING for ast
 
-  sink(topRef.notSource1()); // $ SPURIOUS: ast,ir
-  sink(topRef.notSource2()); // $ SPURIOUS: ast,ir
+  sink(topRef.notSource1()); // $ SPURIOUS: ast
+  sink(topRef.notSource2()); // $ SPURIOUS: ast
   topRef.notSink(source()); // causing SPURIOUS for ast,ir
 }
 
@@ -126,8 +126,8 @@ namespace virtual_inheritance {
     // get flow from a `Middle` value to the call qualifier.
     Top *topPtr = bottomPtr, &topRef = bottomRef;
 
-    sink(topPtr->isSource()); // $ MISSING: ast,ir
-    sink(topRef.isSource()); // $ MISSING: ast,ir
+    sink(topPtr->isSource()); // $ ir MISSING: ast
+    sink(topRef.isSource()); // $ ir MISSING: ast
   }
 }
 
diff --git a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
index 6e0b03be9c61..8c009241734a 100644
--- a/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
+++ b/cpp/ql/test/library-tests/dataflow/dataflow-tests/test-source-sink.expected
@@ -169,10 +169,6 @@ irFlow
 | clang.cpp:50:35:50:40 | call to source | clang.cpp:53:17:53:26 | *stackArray |
 | clang.cpp:51:19:51:24 | call to source | clang.cpp:53:17:53:26 | *stackArray |
 | clang.cpp:57:21:57:28 | call to source | clang.cpp:59:8:59:8 | d |
-| dispatch.cpp:9:37:9:42 | call to source | dispatch.cpp:35:16:35:25 | call to notSource1 |
-| dispatch.cpp:9:37:9:42 | call to source | dispatch.cpp:43:15:43:24 | call to notSource1 |
-| dispatch.cpp:10:37:10:42 | call to source | dispatch.cpp:36:16:36:25 | call to notSource2 |
-| dispatch.cpp:10:37:10:42 | call to source | dispatch.cpp:44:15:44:24 | call to notSource2 |
 | dispatch.cpp:16:37:16:42 | call to source | dispatch.cpp:32:16:32:24 | call to isSource2 |
 | dispatch.cpp:16:37:16:42 | call to source | dispatch.cpp:40:15:40:23 | call to isSource2 |
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:31:16:31:24 | call to isSource1 |
@@ -180,13 +176,13 @@ irFlow
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:55:22:55:30 | call to isSource1 |
 | dispatch.cpp:22:37:22:42 | call to source | dispatch.cpp:58:28:58:36 | call to isSource1 |
 | dispatch.cpp:33:18:33:23 | call to source | dispatch.cpp:23:38:23:38 | x |
-| dispatch.cpp:37:19:37:24 | call to source | dispatch.cpp:11:38:11:38 | x |
 | dispatch.cpp:41:17:41:22 | call to source | dispatch.cpp:23:38:23:38 | x |
-| dispatch.cpp:45:18:45:23 | call to source | dispatch.cpp:11:38:11:38 | x |
 | dispatch.cpp:69:15:69:20 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:73:14:73:19 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:81:13:81:18 | call to source | dispatch.cpp:23:38:23:38 | x |
 | dispatch.cpp:107:17:107:22 | call to source | dispatch.cpp:96:8:96:8 | x |
+| dispatch.cpp:117:38:117:43 | call to source | dispatch.cpp:129:18:129:25 | call to isSource |
+| dispatch.cpp:117:38:117:43 | call to source | dispatch.cpp:130:17:130:24 | call to isSource |
 | dispatch.cpp:140:8:140:13 | call to source | dispatch.cpp:96:8:96:8 | x |
 | dispatch.cpp:144:8:144:13 | call to source | dispatch.cpp:96:8:96:8 | x |
 | flowOut.cpp:5:16:5:21 | call to source | flowOut.cpp:31:9:31:9 | x |
diff --git a/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp b/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp
new file mode 100644
index 000000000000..f243b76ad140
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/dispatch/test.cpp
@@ -0,0 +1,127 @@
+struct Base {
+  void f();
+  virtual void virtual_f();
+};
+
+struct Derived : Base {
+  void f();
+  void virtual_f();
+};
+
+void test_simple() {
+  Base b;
+  b.f(); // $ target=2
+  b.virtual_f(); // $ target=3
+
+  Derived d;
+  d.f(); // $ target=7
+  d.virtual_f(); // $ target=8
+
+  Base* b_ptr = &d;
+  b_ptr->f(); // $ target=2
+  b_ptr->virtual_f(); // $ target=8
+
+  Base& b_ref = d;
+  b_ref.f(); // $ target=2
+  b_ref.virtual_f(); // $ target=8
+
+  Base* b_null = nullptr;
+  b_null->f(); // $ target=2
+  b_null->virtual_f(); // $ target=3
+
+  Base* base_is_derived = new Derived();
+  base_is_derived->f(); // $ target=2
+  base_is_derived->virtual_f(); // $ target=8
+
+  Base* base_is_base = new Base();
+  base_is_base->f(); // $ target=2
+  base_is_base->virtual_f(); // $ target=3
+
+  Derived* derived_is_derived = new Derived();
+  derived_is_derived->f(); // $ target=7
+  derived_is_derived->virtual_f(); // $ target=8
+
+  Base& b_ref2 = b;
+  b_ref2 = d;
+  b_ref2.f(); // $ target=2
+  b_ref2.virtual_f(); // $ target=3
+}
+
+struct S {
+  Base* b1;
+  Base* b2;
+};
+
+void test_fields() {
+  S s;
+
+  s.b1 = new Base();
+  s.b2 = new Derived();
+
+  s.b1->virtual_f(); // $ target=3
+  s.b2->virtual_f(); // $ target=8
+
+  s.b1 = new Derived();
+  s.b2 = new Base();
+  s.b1->virtual_f(); // $ target=8 SPURIOUS: target=3 // type-tracking has no 'clearsContent' feature and C/C++ doesn't have field-based SSA
+  s.b2->virtual_f(); // $ target=3 SPURIOUS: target=8 // type-tracking has no 'clearsContent' feature and C/C++ doesn't have field-based SSA
+}
+
+Base* getDerived() {
+  return new Derived();
+}
+
+void test_getDerived() {
+  Base* b = getDerived();
+  b->virtual_f(); // $ target=8
+
+  Derived d = *(Derived*)getDerived();
+  d.virtual_f(); // $ target=8
+}
+
+void write_to_arg(Base* b) {
+  *b = Derived();
+}
+
+void write_to_arg_2(Base** b) {
+	Derived* d = new Derived();
+  *b = d;
+}
+
+void test_write_to_arg() {
+  {
+    Base b;
+    write_to_arg(&b);
+    b.virtual_f(); // $ SPURIOUS: target=3 MISSING: target=8 // missing flow through the copy-constructor in write_to_arg
+  }
+
+  {
+    Base* b;
+    write_to_arg_2(&b);
+    b->virtual_f(); // $ target=8
+  }
+}
+
+Base* global_derived;
+
+void set_global_to_derived() {
+  global_derived = new Derived();
+}
+
+void read_global() {
+  global_derived->virtual_f(); // $ target=8
+}
+
+Base* global_base_or_derived;
+
+void set_global_base_or_derived_1() {
+  global_base_or_derived = new Base();
+}
+
+void set_global_base_or_derived_2() {
+  global_base_or_derived = new Derived();
+}
+
+void read_global_base_or_derived() {
+  global_base_or_derived->virtual_f(); // $ target=3 target=8
+}
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/dispatch/test.expected b/cpp/ql/test/library-tests/dataflow/dispatch/test.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/cpp/ql/test/library-tests/dataflow/dispatch/test.ql b/cpp/ql/test/library-tests/dataflow/dispatch/test.ql
new file mode 100644
index 000000000000..de16d6da1ef1
--- /dev/null
+++ b/cpp/ql/test/library-tests/dataflow/dispatch/test.ql
@@ -0,0 +1,22 @@
+import cpp
+import utils.test.InlineExpectationsTest
+import semmle.code.cpp.ir.dataflow.internal.DataFlowDispatch
+import semmle.code.cpp.ir.dataflow.internal.DataFlowPrivate
+
+module ResolveDispatchTest implements TestSig {
+  string getARelevantTag() { result = "target" }
+
+  predicate hasActualResult(Location location, string element, string tag, string value) {
+    exists(DataFlowCall call, SourceCallable callable, MemberFunction mf |
+      mf = callable.asSourceCallable() and
+      not mf.isCompilerGenerated() and
+      callable = viableCallable(call) and
+      location = call.getLocation() and
+      element = call.toString() and
+      tag = "target" and
+      value = callable.getLocation().getStartLine().toString()
+    )
+  }
+}
+
+import MakeTest<ResolveDispatchTest>
diff --git a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
index aeb2362ef339..1b74b290eb39 100644
--- a/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
+++ b/cpp/ql/test/library-tests/dataflow/external-models/validatemodels.expected
@@ -6,12 +6,14 @@
 | Dubious member name "operator LPWSTR" in summary model. |
 | Dubious member name "operator PCXSTR" in summary model. |
 | Dubious member name "operator PXSTR" in summary model. |
+| Dubious member name "operator void**" in summary model. |
 | Dubious member name "operator&" in summary model. |
 | Dubious member name "operator*" in summary model. |
 | Dubious member name "operator+" in summary model. |
 | Dubious member name "operator+=" in summary model. |
 | Dubious member name "operator->" in summary model. |
 | Dubious member name "operator=" in summary model. |
+| Dubious member name "operator=<U>" in summary model. |
 | Dubious member name "operator[]" in summary model. |
 | Dubious signature "(..(*)(..))" in summary model. |
 | Dubious signature "(..(*)(..),..(*)(..),..(*)(..),..(*)(..))" in summary model. |
@@ -503,6 +505,7 @@
 | Dubious signature "(CURLU *,CURLUPart,const char *,unsigned int)" in summary model. |
 | Dubious signature "(CURLU *,const char *)" in summary model. |
 | Dubious signature "(CURLU *,const char *,char **,OperationConfig *)" in summary model. |
+| Dubious signature "(ComPtr &&)" in summary model. |
 | Dubious signature "(CompoundDictionary *,const PreparedDictionary *)" in summary model. |
 | Dubious signature "(Curl_cfilter *)" in summary model. |
 | Dubious signature "(Curl_cfilter **,Curl_easy *)" in summary model. |
@@ -2130,6 +2133,7 @@
 | Dubious signature "(RAND_POOL *,unsigned char *)" in summary model. |
 | Dubious signature "(RAND_POOL *,unsigned int)" in summary model. |
 | Dubious signature "(RECORD_LAYER *,SSL_CONNECTION *)" in summary model. |
+| Dubious signature "(REFIID,void **)" in summary model. |
 | Dubious signature "(RIO_NOTIFIER *)" in summary model. |
 | Dubious signature "(RIPEMD160_CTX *,const unsigned char *)" in summary model. |
 | Dubious signature "(RIPEMD160_CTX *,const void *,size_t)" in summary model. |
@@ -2431,6 +2435,8 @@
 | Dubious signature "(Strent *)" in summary model. |
 | Dubious signature "(Strtab *,const char *,size_t)" in summary model. |
 | Dubious signature "(Strtab *,size_t *)" in summary model. |
+| Dubious signature "(T *)" in summary model. |
+| Dubious signature "(T **)" in summary model. |
 | Dubious signature "(TLS_FEATURE *)" in summary model. |
 | Dubious signature "(TLS_RL_RECORD *,const unsigned char *)" in summary model. |
 | Dubious signature "(TS_ACCURACY *)" in summary model. |
@@ -2493,6 +2499,7 @@
 | Dubious signature "(TS_VERIFY_CTX *,unsigned char *,long)" in summary model. |
 | Dubious signature "(TXT_DB *,OPENSSL_STRING *)" in summary model. |
 | Dubious signature "(TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC)" in summary model. |
+| Dubious signature "(U *)" in summary model. |
 | Dubious signature "(UI *)" in summary model. |
 | Dubious signature "(UI *,UI_STRING *,const char *)" in summary model. |
 | Dubious signature "(UI *,UI_STRING *,const char *,int)" in summary model. |
@@ -3155,6 +3162,7 @@
 | Dubious signature "(const CT_POLICY_EVAL_CTX *)" in summary model. |
 | Dubious signature "(const CURLU *)" in summary model. |
 | Dubious signature "(const CURLU *,CURLUPart,char **,unsigned int)" in summary model. |
+| Dubious signature "(const ComPtr &)" in summary model. |
 | Dubious signature "(const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *)" in summary model. |
 | Dubious signature "(const Curl_easy *,const connectdata *,int)" in summary model. |
 | Dubious signature "(const DH *)" in summary model. |
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 e26416a0e68c..aff51f629647 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/atl.cpp
@@ -1241,4 +1241,221 @@ namespace ATL {
     sink(static_cast<CStrBufT<char>::PCXSTR>(b)); // $ ir
     sink(static_cast<CStrBufT<char>::PXSTR>(b)); // $ ir
   }
+}
+
+namespace Microsoft {
+  namespace WRL {
+  template <typename T>
+  class ComPtr;
+
+  struct GUID;
+
+  typedef GUID IID;
+
+  typedef IID *REFIID;
+
+  class IUnknown;
+
+  class WeakRef;
+
+  namespace Details {
+    template <typename T>
+    class ComPtrRef {
+      public:
+      using InterfaceType = T;
+
+      ComPtrRef(T*);
+
+      InterfaceType* const * GetAddressOf() const;
+      InterfaceType** ReleaseAndGetAddressOf();
+
+      operator InterfaceType**();
+      operator T*();
+      operator void**() const;
+      InterfaceType* operator *();
+    };
+  }
+
+  template <typename T>
+  class ComPtr
+  {
+  public:
+    using InterfaceType = T;
+
+    ComPtr();
+    ComPtr(const ComPtr &);
+    ComPtr(ComPtr &&);
+
+    template <typename U>
+    ComPtr(U *);
+
+    ~ComPtr();
+
+    template <typename U>
+    HRESULT As(ComPtr<U> *p) const;
+
+    HRESULT AsWeak(WeakRef *);
+
+    void Attach(InterfaceType *);
+
+    HRESULT CopyTo(InterfaceType **);
+
+    HRESULT CopyTo(REFIID, void **) const;
+
+    template <typename U>
+    HRESULT CopyTo(U **) const;
+
+    T *Detach();
+
+    T *Get() const;
+
+    T *const *GetAddressOf() const;
+    T **GetAddressOf();
+
+    T **ReleaseAndGetAddressOf();
+
+    unsigned long Reset();
+
+    void Swap(ComPtr &&r);
+
+    void Swap(ComPtr &r);
+
+    Details::ComPtrRef<ComPtr<T>> operator&();
+    const Details::ComPtrRef<const ComPtr<T>> operator&() const;
+
+    InterfaceType* operator->() const; // return type simplified from Microsoft::WRL::Details::RemoveIUnknown<InterfaceType>*
+
+    ComPtr& operator=(T *);
+    template <typename U>
+    ComPtr& operator=(U *);
+    ComPtr& operator=(const ComPtr &);
+    template<class U>
+    ComPtr& operator=(const ComPtr<U>&);
+    ComPtr& operator=(ComPtr &&);
+    template<class U>
+    ComPtr& operator=(ComPtr<U>&&);
+    };
+
+  }
+}
+
+namespace std {
+  template<class T> T&& move(T& t) noexcept; // simplified signature
+}
+
+void test_constructor()
+{
+  Microsoft::WRL::ComPtr<int> p0;
+  sink(*p0.Get()); // clean
+
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  sink(*p1.Get()); // $ ir MISSING: ast
+  sink(*p1.Detach()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2(p1);
+  sink(*p2.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(std::move(p1));
+  sink(*p3.Get()); // $ ir MISSING: ast
+}
+
+void test_As()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::ComPtr<int>* p2;
+  p1.As(p2);
+  sink(*p2->Get()); // $ ir MISSING: ast
+}
+
+void test_CopyTo()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  int *raw = nullptr;
+  p1.CopyTo(&raw);
+  sink(*raw); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2;
+  p1.CopyTo(nullptr, (void**)&raw);
+  sink(*raw); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(new int(x));
+
+  int* raw2 = nullptr;
+  p3.CopyTo<int>(&raw2);
+  sink(*raw2); // $ ir MISSING: ast
+}
+
+void test_Swap()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::ComPtr<int> p2;
+  p1.Swap(p2);
+  sink(*p2.Get()); // $ ir MISSING: ast
+  sink(*p1.Get()); // $ SPURIOUS: ir
+}
+
+void test_GetAddressOf()
+{
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  sink(**p1.GetAddressOf()); // $ ir MISSING: ast
+ 
+  const Microsoft::WRL::ComPtr<int> p2(new int(x));
+  sink(**p2.GetAddressOf()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3(new int(x));
+  int **pp = p3.ReleaseAndGetAddressOf();
+  sink(**pp); // $ ir MISSING: ast
+}
+
+struct S {
+  int x;
+};
+
+void test_address_of_deref_operators() {
+  int x = source<int>();
+  Microsoft::WRL::ComPtr<int> p1(new int(x));
+  Microsoft::WRL::Details::ComPtrRef<Microsoft::WRL::ComPtr<int>> pp = &p1;
+  Microsoft::WRL::ComPtr<int>* qq = *pp;
+  sink(*qq->Get()); // $ ir MISSING: ast
+  
+  const Microsoft::WRL::ComPtr<int> p2(new int(x));
+  Microsoft::WRL::Details::ComPtrRef<const Microsoft::WRL::ComPtr<int>> pp2 = &p2;
+  const Microsoft::WRL::ComPtr<int>* qq2 = *pp2;
+  sink(*qq2->Get()); // $ ir MISSING: ast
+
+  S s;
+  s.x = source<int>();
+  Microsoft::WRL::ComPtr<S> p3(&s);
+  sink(p3->x); // $ ir MISSING: ast
+}
+
+void test_assignments() {
+  Microsoft::WRL::ComPtr<int> p1;
+  p1 = new int(source<int>());
+  sink(*p1.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p2;
+  p2 = new long(source<long>());
+  sink(*p2.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p3;
+  p3 = p1;
+  sink(*p3.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<long> p4;
+  p4 = p1;
+  sink(*p4.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<int> p5;
+  p5 = std::move(p1);
+  sink(*p5.Get()); // $ ir MISSING: ast
+
+  Microsoft::WRL::ComPtr<long> p6;
+  p6 = std::move(p1);
+  sink(*p6.Get()); // $ ir MISSING: ast
 }
\ 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 e19f34eb2170..e8f0a8e34b25 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/localTaint.expected
@@ -1278,6 +1278,223 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | 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 |  |
+| atl.cpp:1348:31:1348:32 | call to ComPtr | atl.cpp:1349:9:1349:10 | p0 |  |
+| atl.cpp:1348:31:1348:32 | call to ComPtr | atl.cpp:1361:1:1361:1 | p0 |  |
+| atl.cpp:1349:9:1349:10 | ref arg p0 | atl.cpp:1361:1:1361:1 | p0 |  |
+| atl.cpp:1349:12:1349:14 | call to Get | atl.cpp:1349:8:1349:16 | * ... | TAINT |
+| atl.cpp:1351:11:1351:21 | call to source | atl.cpp:1352:42:1352:42 | x |  |
+| atl.cpp:1352:34:1352:43 | new | atl.cpp:1352:34:1352:44 | call to ComPtr | TAINT |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1353:9:1353:10 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1354:9:1354:10 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1352:34:1352:44 | call to ComPtr | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1352:42:1352:42 | x | atl.cpp:1352:34:1352:43 | new |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1354:9:1354:10 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1353:9:1353:10 | ref arg p1 | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1353:12:1353:14 | call to Get | atl.cpp:1353:8:1353:16 | * ... | TAINT |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1356:34:1356:35 | p1 |  |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1359:44:1359:45 | p1 |  |
+| atl.cpp:1354:9:1354:10 | ref arg p1 | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1354:12:1354:17 | call to Detach | atl.cpp:1354:8:1354:19 | * ... | TAINT |
+| atl.cpp:1356:34:1356:35 | p1 | atl.cpp:1356:34:1356:36 | call to ComPtr |  |
+| atl.cpp:1356:34:1356:36 | call to ComPtr | atl.cpp:1357:9:1357:10 | p2 |  |
+| atl.cpp:1356:34:1356:36 | call to ComPtr | atl.cpp:1361:1:1361:1 | p2 |  |
+| atl.cpp:1357:9:1357:10 | ref arg p2 | atl.cpp:1361:1:1361:1 | p2 |  |
+| atl.cpp:1357:12:1357:14 | call to Get | atl.cpp:1357:8:1357:16 | * ... | TAINT |
+| atl.cpp:1359:34:1359:42 | call to move | atl.cpp:1359:34:1359:47 | call to ComPtr | TAINT |
+| atl.cpp:1359:34:1359:42 | ref arg call to move | atl.cpp:1359:44:1359:45 | p1 [inner post update] |  |
+| atl.cpp:1359:34:1359:42 | ref arg call to move | atl.cpp:1361:1:1361:1 | p1 |  |
+| atl.cpp:1359:34:1359:47 | call to ComPtr | atl.cpp:1360:9:1360:10 | p3 |  |
+| atl.cpp:1359:34:1359:47 | call to ComPtr | atl.cpp:1361:1:1361:1 | p3 |  |
+| atl.cpp:1359:44:1359:45 | p1 | atl.cpp:1359:34:1359:42 | call to move | TAINT |
+| atl.cpp:1359:44:1359:45 | p1 | atl.cpp:1359:34:1359:47 | call to ComPtr |  |
+| atl.cpp:1360:9:1360:10 | ref arg p3 | atl.cpp:1361:1:1361:1 | p3 |  |
+| atl.cpp:1360:12:1360:14 | call to Get | atl.cpp:1360:8:1360:16 | * ... | TAINT |
+| atl.cpp:1365:11:1365:21 | call to source | atl.cpp:1366:42:1366:42 | x |  |
+| atl.cpp:1366:34:1366:43 | new | atl.cpp:1366:34:1366:44 | call to ComPtr | TAINT |
+| atl.cpp:1366:34:1366:44 | call to ComPtr | atl.cpp:1368:3:1368:4 | p1 |  |
+| atl.cpp:1366:34:1366:44 | call to ComPtr | atl.cpp:1370:1:1370:1 | p1 |  |
+| atl.cpp:1366:42:1366:42 | x | atl.cpp:1366:34:1366:43 | new |  |
+| atl.cpp:1367:32:1367:33 | p2 | atl.cpp:1368:9:1368:10 | p2 |  |
+| atl.cpp:1367:32:1367:33 | p2 | atl.cpp:1369:9:1369:10 | p2 |  |
+| atl.cpp:1368:9:1368:10 | ref arg p2 | atl.cpp:1369:9:1369:10 | p2 |  |
+| atl.cpp:1369:13:1369:15 | call to Get | atl.cpp:1369:8:1369:17 | * ... | TAINT |
+| atl.cpp:1374:11:1374:21 | call to source | atl.cpp:1375:42:1375:42 | x |  |
+| atl.cpp:1374:11:1374:21 | call to source | atl.cpp:1384:42:1384:42 | x |  |
+| atl.cpp:1375:34:1375:43 | new | atl.cpp:1375:34:1375:44 | call to ComPtr | TAINT |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1377:3:1377:4 | p1 |  |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1381:3:1381:4 | p1 |  |
+| atl.cpp:1375:34:1375:44 | call to ComPtr | atl.cpp:1389:1:1389:1 | p1 |  |
+| atl.cpp:1375:42:1375:42 | x | atl.cpp:1375:34:1375:43 | new |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1377:14:1377:16 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1378:9:1378:11 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1381:31:1381:33 | raw |  |
+| atl.cpp:1376:14:1376:20 | 0 | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1377:3:1377:4 | ref arg p1 | atl.cpp:1381:3:1381:4 | p1 |  |
+| atl.cpp:1377:3:1377:4 | ref arg p1 | atl.cpp:1389:1:1389:1 | p1 |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1377:14:1377:16 | raw [inner post update] |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1378:9:1378:11 | raw |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1381:31:1381:33 | raw |  |
+| atl.cpp:1377:13:1377:16 | ref arg & ... | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1377:14:1377:16 | raw | atl.cpp:1377:13:1377:16 | & ... |  |
+| atl.cpp:1378:9:1378:11 | raw | atl.cpp:1378:8:1378:11 | * ... | TAINT |
+| atl.cpp:1380:31:1380:32 | call to ComPtr | atl.cpp:1389:1:1389:1 | p2 |  |
+| atl.cpp:1381:30:1381:33 | ref arg & ... | atl.cpp:1381:31:1381:33 | raw [inner post update] |  |
+| atl.cpp:1381:30:1381:33 | ref arg & ... | atl.cpp:1382:9:1382:11 | raw |  |
+| atl.cpp:1381:31:1381:33 | raw | atl.cpp:1381:30:1381:33 | & ... |  |
+| atl.cpp:1382:9:1382:11 | raw | atl.cpp:1382:8:1382:11 | * ... | TAINT |
+| atl.cpp:1384:34:1384:43 | new | atl.cpp:1384:34:1384:44 | call to ComPtr | TAINT |
+| atl.cpp:1384:34:1384:44 | call to ComPtr | atl.cpp:1387:3:1387:4 | p3 |  |
+| atl.cpp:1384:34:1384:44 | call to ComPtr | atl.cpp:1389:1:1389:1 | p3 |  |
+| atl.cpp:1384:42:1384:42 | x | atl.cpp:1384:34:1384:43 | new |  |
+| atl.cpp:1386:15:1386:21 | 0 | atl.cpp:1387:19:1387:22 | raw2 |  |
+| atl.cpp:1386:15:1386:21 | 0 | atl.cpp:1388:9:1388:12 | raw2 |  |
+| atl.cpp:1387:18:1387:22 | ref arg & ... | atl.cpp:1387:19:1387:22 | raw2 [inner post update] |  |
+| atl.cpp:1387:18:1387:22 | ref arg & ... | atl.cpp:1388:9:1388:12 | raw2 |  |
+| atl.cpp:1387:19:1387:22 | raw2 | atl.cpp:1387:18:1387:22 | & ... |  |
+| atl.cpp:1388:9:1388:12 | raw2 | atl.cpp:1388:8:1388:12 | * ... | TAINT |
+| atl.cpp:1393:11:1393:21 | call to source | atl.cpp:1394:42:1394:42 | x |  |
+| atl.cpp:1394:34:1394:43 | new | atl.cpp:1394:34:1394:44 | call to ComPtr | TAINT |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1396:3:1396:4 | p1 |  |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1398:9:1398:10 | p1 |  |
+| atl.cpp:1394:34:1394:44 | call to ComPtr | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1394:42:1394:42 | x | atl.cpp:1394:34:1394:43 | new |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1396:11:1396:12 | p2 |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1397:9:1397:10 | p2 |  |
+| atl.cpp:1395:31:1395:32 | call to ComPtr | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1396:3:1396:4 | ref arg p1 | atl.cpp:1398:9:1398:10 | p1 |  |
+| atl.cpp:1396:3:1396:4 | ref arg p1 | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1396:11:1396:12 | ref arg p2 | atl.cpp:1397:9:1397:10 | p2 |  |
+| atl.cpp:1396:11:1396:12 | ref arg p2 | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1397:9:1397:10 | ref arg p2 | atl.cpp:1399:1:1399:1 | p2 |  |
+| atl.cpp:1397:12:1397:14 | call to Get | atl.cpp:1397:8:1397:16 | * ... | TAINT |
+| atl.cpp:1398:9:1398:10 | ref arg p1 | atl.cpp:1399:1:1399:1 | p1 |  |
+| atl.cpp:1398:12:1398:14 | call to Get | atl.cpp:1398:8:1398:16 | * ... | TAINT |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1404:42:1404:42 | x |  |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1407:48:1407:48 | x |  |
+| atl.cpp:1403:11:1403:21 | call to source | atl.cpp:1410:42:1410:42 | x |  |
+| atl.cpp:1404:34:1404:43 | new | atl.cpp:1404:34:1404:44 | call to ComPtr | TAINT |
+| atl.cpp:1404:34:1404:44 | call to ComPtr | atl.cpp:1405:10:1405:11 | p1 |  |
+| atl.cpp:1404:34:1404:44 | call to ComPtr | atl.cpp:1413:1:1413:1 | p1 |  |
+| atl.cpp:1404:42:1404:42 | x | atl.cpp:1404:34:1404:43 | new |  |
+| atl.cpp:1405:9:1405:26 | * ... | atl.cpp:1405:8:1405:26 | * ... | TAINT |
+| atl.cpp:1405:10:1405:11 | ref arg p1 | atl.cpp:1413:1:1413:1 | p1 |  |
+| atl.cpp:1405:13:1405:24 | call to GetAddressOf | atl.cpp:1405:9:1405:26 | * ... | TAINT |
+| atl.cpp:1407:40:1407:49 | new | atl.cpp:1407:40:1407:50 | call to ComPtr | TAINT |
+| atl.cpp:1407:40:1407:50 | call to ComPtr | atl.cpp:1408:10:1408:11 | p2 |  |
+| atl.cpp:1407:40:1407:50 | call to ComPtr | atl.cpp:1413:1:1413:1 | p2 |  |
+| atl.cpp:1407:48:1407:48 | x | atl.cpp:1407:40:1407:49 | new |  |
+| atl.cpp:1408:9:1408:26 | * ... | atl.cpp:1408:8:1408:26 | * ... | TAINT |
+| atl.cpp:1408:10:1408:11 | ref arg p2 | atl.cpp:1413:1:1413:1 | p2 |  |
+| atl.cpp:1408:13:1408:24 | call to GetAddressOf | atl.cpp:1408:9:1408:26 | * ... | TAINT |
+| atl.cpp:1410:34:1410:43 | new | atl.cpp:1410:34:1410:44 | call to ComPtr | TAINT |
+| atl.cpp:1410:34:1410:44 | call to ComPtr | atl.cpp:1411:14:1411:15 | p3 |  |
+| atl.cpp:1410:34:1410:44 | call to ComPtr | atl.cpp:1413:1:1413:1 | p3 |  |
+| atl.cpp:1410:42:1410:42 | x | atl.cpp:1410:34:1410:43 | new |  |
+| atl.cpp:1411:14:1411:15 | ref arg p3 | atl.cpp:1413:1:1413:1 | p3 |  |
+| atl.cpp:1411:17:1411:38 | call to ReleaseAndGetAddressOf | atl.cpp:1412:10:1412:11 | pp |  |
+| atl.cpp:1412:9:1412:11 | * ... | atl.cpp:1412:8:1412:11 | * ... | TAINT |
+| atl.cpp:1412:10:1412:11 | pp | atl.cpp:1412:9:1412:11 | * ... | TAINT |
+| atl.cpp:1420:11:1420:21 | call to source | atl.cpp:1421:42:1421:42 | x |  |
+| atl.cpp:1420:11:1420:21 | call to source | atl.cpp:1426:48:1426:48 | x |  |
+| atl.cpp:1421:34:1421:43 | new | atl.cpp:1421:34:1421:44 | call to ComPtr | TAINT |
+| atl.cpp:1421:34:1421:44 | call to ComPtr | atl.cpp:1422:73:1422:74 | p1 |  |
+| atl.cpp:1421:34:1421:44 | call to ComPtr | atl.cpp:1435:1:1435:1 | p1 |  |
+| atl.cpp:1421:42:1421:42 | x | atl.cpp:1421:34:1421:43 | new |  |
+| atl.cpp:1422:72:1422:72 | call to operator& | atl.cpp:1423:38:1423:39 | pp |  |
+| atl.cpp:1422:73:1422:74 | ref arg p1 | atl.cpp:1435:1:1435:1 | p1 |  |
+| atl.cpp:1423:37:1423:37 | call to operator* | atl.cpp:1424:9:1424:10 | qq |  |
+| atl.cpp:1424:13:1424:15 | call to Get | atl.cpp:1424:8:1424:17 | * ... | TAINT |
+| atl.cpp:1426:40:1426:49 | new | atl.cpp:1426:40:1426:50 | call to ComPtr | TAINT |
+| atl.cpp:1426:40:1426:50 | call to ComPtr | atl.cpp:1427:80:1427:81 | p2 |  |
+| atl.cpp:1426:40:1426:50 | call to ComPtr | atl.cpp:1435:1:1435:1 | p2 |  |
+| atl.cpp:1426:48:1426:48 | x | atl.cpp:1426:40:1426:49 | new |  |
+| atl.cpp:1427:79:1427:79 | call to operator& | atl.cpp:1428:45:1428:47 | pp2 |  |
+| atl.cpp:1428:44:1428:44 | call to operator* | atl.cpp:1429:9:1429:11 | qq2 |  |
+| atl.cpp:1429:14:1429:16 | call to Get | atl.cpp:1429:8:1429:18 | * ... | TAINT |
+| atl.cpp:1431:5:1431:5 | s | atl.cpp:1432:3:1432:3 | s |  |
+| atl.cpp:1431:5:1431:5 | s | atl.cpp:1433:33:1433:33 | s |  |
+| atl.cpp:1432:3:1432:3 | s [post update] | atl.cpp:1433:33:1433:33 | s |  |
+| atl.cpp:1432:3:1432:21 | ... = ... | atl.cpp:1432:5:1432:5 | x [post update] |  |
+| atl.cpp:1432:9:1432:19 | call to source | atl.cpp:1432:3:1432:21 | ... = ... |  |
+| atl.cpp:1433:32:1433:33 | & ... | atl.cpp:1433:32:1433:34 | call to ComPtr | TAINT |
+| atl.cpp:1433:32:1433:33 | ref arg & ... | atl.cpp:1433:33:1433:33 | s [inner post update] |  |
+| atl.cpp:1433:32:1433:34 | call to ComPtr | atl.cpp:1434:8:1434:9 | p3 |  |
+| atl.cpp:1433:32:1433:34 | call to ComPtr | atl.cpp:1435:1:1435:1 | p3 |  |
+| atl.cpp:1433:33:1433:33 | s | atl.cpp:1433:32:1433:33 | & ... |  |
+| atl.cpp:1434:8:1434:9 | ref arg p3 | atl.cpp:1435:1:1435:1 | p3 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1439:3:1439:4 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1440:9:1440:10 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1438:31:1438:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1440:9:1440:10 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1439:3:1439:4 | ref arg p1 | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1439:16:1439:26 | call to source | atl.cpp:1439:8:1439:29 | new |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1447:8:1447:9 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1451:8:1451:9 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1455:18:1455:19 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1440:9:1440:10 | ref arg p1 | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1440:12:1440:14 | call to Get | atl.cpp:1440:8:1440:16 | * ... | TAINT |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1443:3:1443:4 | p2 |  |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1444:9:1444:10 | p2 |  |
+| atl.cpp:1442:31:1442:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1443:3:1443:4 | ref arg p2 | atl.cpp:1444:9:1444:10 | p2 |  |
+| atl.cpp:1443:3:1443:4 | ref arg p2 | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1443:17:1443:28 | call to source | atl.cpp:1443:8:1443:31 | new |  |
+| atl.cpp:1444:9:1444:10 | ref arg p2 | atl.cpp:1461:1:1461:1 | p2 |  |
+| atl.cpp:1444:12:1444:14 | call to Get | atl.cpp:1444:8:1444:16 | * ... | TAINT |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1447:3:1447:4 | p3 |  |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1448:9:1448:10 | p3 |  |
+| atl.cpp:1446:31:1446:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1447:3:1447:4 | ref arg p3 | atl.cpp:1448:9:1448:10 | p3 |  |
+| atl.cpp:1447:3:1447:4 | ref arg p3 | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1447:8:1447:9 | p1 | atl.cpp:1447:3:1447:4 | ref arg p3 | TAINT |
+| atl.cpp:1447:8:1447:9 | p1 | atl.cpp:1447:6:1447:6 | call to operator= | TAINT |
+| atl.cpp:1448:9:1448:10 | ref arg p3 | atl.cpp:1461:1:1461:1 | p3 |  |
+| atl.cpp:1448:12:1448:14 | call to Get | atl.cpp:1448:8:1448:16 | * ... | TAINT |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1451:3:1451:4 | p4 |  |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1452:9:1452:10 | p4 |  |
+| atl.cpp:1450:32:1450:33 | call to ComPtr | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1451:3:1451:4 | ref arg p4 | atl.cpp:1452:9:1452:10 | p4 |  |
+| atl.cpp:1451:3:1451:4 | ref arg p4 | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1452:9:1452:10 | ref arg p4 | atl.cpp:1461:1:1461:1 | p4 |  |
+| atl.cpp:1452:12:1452:14 | call to Get | atl.cpp:1452:8:1452:16 | * ... | TAINT |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1455:3:1455:4 | p5 |  |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1456:9:1456:10 | p5 |  |
+| atl.cpp:1454:31:1454:32 | call to ComPtr | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1455:3:1455:4 | ref arg p5 | atl.cpp:1456:9:1456:10 | p5 |  |
+| atl.cpp:1455:3:1455:4 | ref arg p5 | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1455:8:1455:16 | call to move | atl.cpp:1455:3:1455:4 | ref arg p5 | TAINT |
+| atl.cpp:1455:8:1455:16 | call to move | atl.cpp:1455:6:1455:6 | call to operator= | TAINT |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1455:18:1455:19 | p1 [inner post update] |  |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1459:18:1459:19 | p1 |  |
+| atl.cpp:1455:8:1455:16 | ref arg call to move | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:3:1455:4 | ref arg p5 | TAINT |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:6:1455:6 | call to operator= | TAINT |
+| atl.cpp:1455:18:1455:19 | p1 | atl.cpp:1455:8:1455:16 | call to move | TAINT |
+| atl.cpp:1456:9:1456:10 | ref arg p5 | atl.cpp:1461:1:1461:1 | p5 |  |
+| atl.cpp:1456:12:1456:14 | call to Get | atl.cpp:1456:8:1456:16 | * ... | TAINT |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1459:3:1459:4 | p6 |  |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1460:9:1460:10 | p6 |  |
+| atl.cpp:1458:32:1458:33 | call to ComPtr | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1459:3:1459:4 | ref arg p6 | atl.cpp:1460:9:1460:10 | p6 |  |
+| atl.cpp:1459:3:1459:4 | ref arg p6 | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1459:8:1459:16 | ref arg call to move | atl.cpp:1459:18:1459:19 | p1 [inner post update] |  |
+| atl.cpp:1459:8:1459:16 | ref arg call to move | atl.cpp:1461:1:1461:1 | p1 |  |
+| atl.cpp:1459:18:1459:19 | p1 | atl.cpp:1459:8:1459:16 | call to move | TAINT |
+| atl.cpp:1460:9:1460:10 | ref arg p6 | atl.cpp:1461:1:1461:1 | p6 |  |
+| atl.cpp:1460:12:1460:14 | call to Get | atl.cpp:1460:8:1460:16 | * ... | TAINT |
 | 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 |  |
@@ -7767,6 +7984,10 @@ WARNING: module 'TaintTracking' has been deprecated and may be removed in future
 | taint.cpp:830:20:830:34 | call to indirect_source | taint.cpp:832:23:832:24 | in |  |
 | taint.cpp:831:15:831:17 | out | taint.cpp:832:18:832:20 | out |  |
 | taint.cpp:831:15:831:17 | out | taint.cpp:833:8:833:10 | out |  |
+| taint.cpp:841:21:841:35 | call to indirect_source | taint.cpp:842:11:842:12 | fp |  |
+| taint.cpp:841:21:841:35 | call to indirect_source | taint.cpp:843:16:843:17 | fp |  |
+| taint.cpp:842:11:842:12 | ref arg fp | taint.cpp:843:16:843:17 | fp |  |
+| taint.cpp:842:15:842:16 |  | taint.cpp:842:11:842:12 | ref arg fp | TAINT |
 | thread.cpp:10:27:10:27 | s | thread.cpp:10:27:10:27 | s |  |
 | thread.cpp:10:27:10:27 | s | thread.cpp:11:8:11:8 | s |  |
 | thread.cpp:14:26:14:26 | s | thread.cpp:15:8:15:8 | s |  |
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
index 74bcf26ea7d2..0c09665de1cd 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.cpp
@@ -831,4 +831,15 @@ void test_write_to_const_ptr_ptr() {
   const char* out;
   take_const_ptr(out, in);
   sink(out); // $ SPURIOUS: ast
+}
+
+void indirect_sink(FILE *fp);
+int fprintf(FILE *fp, const char *format, ...);
+
+int f7(void)
+{
+  FILE* fp = (FILE*)indirect_source();
+  fprintf(fp, "");
+	indirect_sink(fp); // $ ir MISSING: ast
+  return 0;
 }
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
index f5f483cdf1b6..3bde6ca03f06 100644
--- a/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
+++ b/cpp/ql/test/library-tests/dataflow/taint-tests/taint.ql
@@ -117,6 +117,11 @@ module IRTest {
         call.getTarget().getName() = "sink" and
         [sink.asExpr(), sink.asIndirectExpr()] = call.getAnArgument()
       )
+      or
+      exists(FunctionCall call |
+        call.getTarget().getName() = "indirect_sink" and
+        sink.asIndirectExpr() = call.getAnArgument()
+      )
     }
 
     predicate isBarrier(DataFlow::Node barrier) {
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 239ed2ec607d..846359fd6b23 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
@@ -5567,6 +5567,31 @@ signatureMatches
 | atl.cpp:1231:5:1231:12 | CStrBufT | (const char *,const char *,unsigned long) |  | __ngettext | 2 |
 | atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) |  | UTF8_putc | 1 |
 | atl.cpp:1231:5:1231:12 | CStrBufT | (unsigned char *,int,unsigned long) |  | UTF8_putc | 2 |
+| atl.cpp:1286:5:1286:10 | ComPtr | (const ComPtr &) | ComPtr | ComPtr | 0 |
+| atl.cpp:1286:5:1286:10 | ComPtr | (const ComPtr &) | ComPtr | operator= | 0 |
+| atl.cpp:1287:5:1287:10 | ComPtr | (ComPtr &&) | ComPtr | ComPtr | 0 |
+| atl.cpp:1287:5:1287:10 | ComPtr | (ComPtr &&) | ComPtr | operator= | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | (T *) | ComPtr | ComPtr<T> | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | (T *) | ComPtr | ComPtr<T> | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | (U *) | ComPtr | operator=<U> | 0 |
+| atl.cpp:1290:5:1290:10 | ComPtr | (U *) | ComPtr | operator=<U> | 0 |
+| atl.cpp:1301:13:1301:18 | CopyTo | (T **) | ComPtr<T> | CopyTo | 0 |
+| atl.cpp:1303:13:1303:18 | CopyTo | (Curl_easy *,void **) |  | Curl_resolver_init | 1 |
+| atl.cpp:1303:13:1303:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 0 |
+| atl.cpp:1303:13:1303:18 | CopyTo | (REFIID,void **) | ComPtr | CopyTo | 1 |
+| atl.cpp:1303:13:1303:18 | CopyTo | (size_t,void **) |  | __libc_alloc_buffer_allocate | 1 |
+| atl.cpp:1306:13:1306:18 | CopyTo | (T **) | ComPtr | CopyTo<T> | 0 |
+| atl.cpp:1328:13:1328:21 | operator= | (T *) | ComPtr<T> | operator= | 0 |
+| atl.cpp:1330:13:1330:21 | operator= | (T *) | ComPtr | ComPtr<T> | 0 |
+| atl.cpp:1330:13:1330:21 | operator= | (U *) | ComPtr | operator=<U> | 0 |
+| atl.cpp:1331:13:1331:21 | operator= | (const ComPtr &) | ComPtr | ComPtr | 0 |
+| atl.cpp:1331:13:1331:21 | operator= | (const ComPtr &) | ComPtr | operator= | 0 |
+| atl.cpp:1333:13:1333:21 | operator= | (const ComPtr &) | ComPtr | ComPtr | 0 |
+| atl.cpp:1333:13:1333:21 | operator= | (const ComPtr &) | ComPtr | operator= | 0 |
+| atl.cpp:1334:13:1334:21 | operator= | (ComPtr &&) | ComPtr | ComPtr | 0 |
+| atl.cpp:1334:13:1334:21 | operator= | (ComPtr &&) | ComPtr | operator= | 0 |
+| atl.cpp:1336:13:1336:21 | operator= | (ComPtr &&) | ComPtr | ComPtr | 0 |
+| atl.cpp:1336:13:1336:21 | operator= | (ComPtr &&) | ComPtr | operator= | 0 |
 | bsd.cpp:12:5:12:10 | accept | (CURLM *,curl_socket_t,int *) |  | curl_multi_socket | 2 |
 | bsd.cpp:12:5:12:10 | accept | (Curl_easy *,ssize_t *,int *) |  | Curl_GetFTPResponse | 2 |
 | bsd.cpp:12:5:12:10 | accept | (EVP_CIPHER_CTX *,unsigned char *,int *) |  | EVP_CipherFinal | 2 |
@@ -9386,6 +9411,8 @@ signatureMatches
 | stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
 | stl.h:333:42:333:47 | insert | (const_iterator,InputIt,InputIt) | vector | insert<InputIt> | 2 |
 | stl.h:335:37:335:43 | emplace | (format_string,Args &&) |  | format<Args> | 1 |
+| stl.h:351:12:351:21 | shared_ptr | (T *) | ComPtr<T> | operator= | 0 |
+| stl.h:369:12:369:21 | unique_ptr | (T *) | ComPtr<T> | operator= | 0 |
 | stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
 | stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
 | stl.h:396:3:396:3 | pair | (const deque &,const Allocator &) | deque<T,Allocator> | deque | 1 |
@@ -17670,6 +17697,55 @@ signatureMatches
 | taint.cpp:822:6:822:19 | take_const_ptr | (unsigned long *,const char *) |  | set_cert_ex | 1 |
 | taint.cpp:822:6:822:19 | take_const_ptr | (unsigned long *,const char *) |  | set_name_ex | 1 |
 | taint.cpp:822:6:822:19 | take_const_ptr | (uv_pipe_t *,const char *) |  | uv_pipe_bind | 1 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_default_uflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_feof | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_ferror | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_file_close_mmap | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_file_underflow_mmap | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_ftell | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_getc | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_getwc | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_new_file_underflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_peekc_locked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_str_count | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_str_underflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_sungetc | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_sungetwc | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_wdefault_uflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_wfile_underflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_wfile_underflow_mmap | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_wstr_count | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | _IO_wstr_underflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __fbufsize | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __feof_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __ferror_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __fileno | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __flbf | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __fopen_maybe_mmap | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __fpending | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __ftello | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __fwriting | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __getc_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __getwc_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __uflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __underflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __wuflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | __wunderflow | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | feof_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | ferror_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | fgetc_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | fgetgrent | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | fgetpwent | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | fgetsgent | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | fgetspent | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | getc_unlocked | 0 |
+| taint.cpp:836:6:836:18 | indirect_sink | (FILE *) |  | getmntent | 0 |
+| taint.cpp:837:5:837:11 | fprintf | (CURLSH *,CURLSHoption,...) |  | curl_share_setopt | 2 |
+| taint.cpp:837:5:837:11 | fprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 1 |
+| taint.cpp:837:5:837:11 | fprintf | (Jim_Interp *,const char *,...) |  | Jim_SetResultFormatted | 2 |
+| taint.cpp:837:5:837:11 | fprintf | (char **,const char *,...) |  | ___asprintf | 1 |
+| taint.cpp:837:5:837:11 | fprintf | (char **,const char *,...) |  | ___asprintf | 2 |
+| taint.cpp:837:5:837:11 | fprintf | (curl_httppost **,curl_httppost **,...) |  | curl_formadd | 2 |
 | thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_STRING_type_new | 0 |
 | thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2bit | 0 |
 | thread.cpp:4:6:4:9 | sink | (int) |  | ASN1_tag2str | 0 |
@@ -21701,6 +21777,8 @@ getSignatureParameterName
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 1 | const char * |
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 2 | char ** |
 | (CURLU *,const char *,char **,OperationConfig *) |  | ipfs_url_rewrite | 3 | OperationConfig * |
+| (ComPtr &&) | ComPtr | ComPtr | 0 | ComPtr && |
+| (ComPtr &&) | ComPtr | operator= | 0 | ComPtr && |
 | (CompoundDictionary *,const PreparedDictionary *) |  | AttachPreparedDictionary | 0 | CompoundDictionary * |
 | (CompoundDictionary *,const PreparedDictionary *) |  | AttachPreparedDictionary | 1 | const PreparedDictionary * |
 | (Curl_cfilter *) |  | Curl_conn_cf_is_ssl | 0 | Curl_cfilter * |
@@ -28531,6 +28609,8 @@ getSignatureParameterName
 | (RAND_POOL *,unsigned int) |  | ossl_rand_pool_bytes_needed | 1 | unsigned int |
 | (RECORD_LAYER *,SSL_CONNECTION *) |  | RECORD_LAYER_init | 0 | RECORD_LAYER * |
 | (RECORD_LAYER *,SSL_CONNECTION *) |  | RECORD_LAYER_init | 1 | SSL_CONNECTION * |
+| (REFIID,void **) | ComPtr | CopyTo | 0 | REFIID |
+| (REFIID,void **) | ComPtr | CopyTo | 1 | void ** |
 | (RIO_NOTIFIER *) |  | ossl_rio_notifier_cleanup | 0 | RIO_NOTIFIER * |
 | (RIPEMD160_CTX *,const unsigned char *) |  | RIPEMD160_Transform | 0 | RIPEMD160_CTX * |
 | (RIPEMD160_CTX *,const unsigned char *) |  | RIPEMD160_Transform | 1 | const unsigned char * |
@@ -30114,6 +30194,10 @@ getSignatureParameterName
 | (Strtab *,const char *,size_t) |  | strtabadd | 2 | size_t |
 | (Strtab *,size_t *) |  | strtabfinalize | 0 | Strtab * |
 | (Strtab *,size_t *) |  | strtabfinalize | 1 | size_t * |
+| (T *) | ComPtr | ComPtr<T> | 0 | func:0 * |
+| (T *) | ComPtr<T> | operator= | 0 | class:0 * |
+| (T **) | ComPtr | CopyTo<T> | 0 | func:0 ** |
+| (T **) | ComPtr<T> | CopyTo | 0 | class:0 ** |
 | (TLS_FEATURE *) |  | TLS_FEATURE_free | 0 | TLS_FEATURE * |
 | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 0 | TLS_RL_RECORD * |
 | (TLS_RL_RECORD *,const unsigned char *) |  | ossl_tls_rl_record_set_seq_num | 1 | const unsigned char * |
@@ -30306,6 +30390,7 @@ getSignatureParameterName
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 2 | ..(*)(..) |
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 3 | OPENSSL_LH_HASHFUNC |
 | (TXT_DB *,int,..(*)(..),OPENSSL_LH_HASHFUNC,OPENSSL_LH_COMPFUNC) |  | TXT_DB_create_index | 4 | OPENSSL_LH_COMPFUNC |
+| (U *) | ComPtr | operator=<U> | 0 | func:0 * |
 | (UI *) |  | UI_get0_user_data | 0 | UI * |
 | (UI *) |  | UI_get_method | 0 | UI * |
 | (UI *,UI_STRING *,const char *) |  | UI_set_result | 0 | UI * |
@@ -33256,6 +33341,8 @@ getSignatureParameterName
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 1 | CURLUPart |
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 2 | char ** |
 | (const CURLU *,CURLUPart,char **,unsigned int) |  | curl_url_get | 3 | unsigned int |
+| (const ComPtr &) | ComPtr | ComPtr | 0 | const ComPtr & |
+| (const ComPtr &) | ComPtr | operator= | 0 | const ComPtr & |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 0 | const Command * |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 1 | const size_t |
 | (const Command *,const size_t,const BlockSplit *,const BlockSplit *,const BlockSplit *,const uint8_t *,size_t,size_t,uint8_t,uint8_t,const ContextType *,HistogramLiteral *,HistogramCommand *,HistogramDistance *) |  | BrotliBuildHistogramsWithContext | 2 | const BlockSplit * |
@@ -46355,6 +46442,27 @@ getParameterTypeName
 | 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 |
+| atl.cpp:1286:5:1286:10 | ComPtr | 0 | const ComPtr & |
+| atl.cpp:1287:5:1287:10 | ComPtr | 0 | ComPtr && |
+| atl.cpp:1290:5:1290:10 | ComPtr | 0 | func:0 * |
+| atl.cpp:1290:5:1290:10 | ComPtr | 0 | func:0 * |
+| atl.cpp:1295:13:1295:14 | As | 0 | ComPtr * |
+| atl.cpp:1301:13:1301:18 | CopyTo | 0 | Interfaceclass:0ype ** |
+| atl.cpp:1301:13:1301:18 | CopyTo | 0 | class:0 ** |
+| atl.cpp:1303:13:1303:18 | CopyTo | 0 | GUID * |
+| atl.cpp:1303:13:1303:18 | CopyTo | 0 | REFIID |
+| atl.cpp:1303:13:1303:18 | CopyTo | 1 | void ** |
+| atl.cpp:1306:13:1306:18 | CopyTo | 0 | func:0 ** |
+| atl.cpp:1321:10:1321:13 | Swap | 0 | ComPtr & |
+| atl.cpp:1328:13:1328:21 | operator= | 0 | class:0 * |
+| atl.cpp:1330:13:1330:21 | operator= | 0 | func:0 * |
+| atl.cpp:1331:13:1331:21 | operator= | 0 | const ComPtr & |
+| atl.cpp:1333:13:1333:21 | operator= | 0 | const ComPtr & |
+| atl.cpp:1334:13:1334:21 | operator= | 0 | ComPtr && |
+| atl.cpp:1336:13:1336:21 | operator= | 0 | ComPtr && |
+| atl.cpp:1343:25:1343:28 | move | 0 | func:0 & |
+| atl.cpp:1415:8:1415:8 | operator= | 0 | S && |
+| atl.cpp:1415:8:1415:8 | operator= | 0 | const S & |
 | 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 |
@@ -47191,6 +47299,10 @@ getParameterTypeName
 | taint.cpp:817:6:817:27 | write_to_const_ptr_ptr | 1 | const char ** |
 | taint.cpp:822:6:822:19 | take_const_ptr | 0 | const char * |
 | taint.cpp:822:6:822:19 | take_const_ptr | 1 | const char * |
+| taint.cpp:836:6:836:18 | indirect_sink | 0 | FILE * |
+| taint.cpp:837:5:837:11 | fprintf | 0 | FILE * |
+| taint.cpp:837:5:837:11 | fprintf | 1 | const char * |
+| taint.cpp:837:5:837:11 | fprintf | 2 | ... |
 | thread.cpp:4:6:4:9 | sink | 0 | int |
 | thread.cpp:6:8:6:8 | operator= | 0 | S && |
 | thread.cpp:6:8:6:8 | operator= | 0 | const S & |
diff --git a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
index 6e62071e7d97..c3085da03ab5 100644
--- a/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
+++ b/cpp/ql/test/library-tests/ir/ir/PrintAST.expected
@@ -24550,6 +24550,37 @@ ir.cpp:
 # 2771|                 Type = [LValueReferenceType] ThreeWay &
 # 2771|                 ValueCategory = prvalue
 # 2772|     getStmt(2): [ReturnStmt] return ...
+# 2774| [TopLevelFunction] void test_allocation_with_initializer()
+# 2774|   <params>: 
+# 2774|   getEntryPoint(): [BlockStmt] { ... }
+# 2775|     getStmt(0): [DeclStmt] declaration
+# 2775|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p1
+# 2775|           Type = [IntPointerType] int *
+# 2775|         getVariable().getInitializer(): [Initializer] initializer for p1
+# 2775|           getExpr(): [NewExpr] new
+# 2775|               Type = [IntPointerType] int *
+# 2775|               ValueCategory = prvalue
+# 2775|             getInitializer(): [Literal] 42
+# 2775|                 Type = [IntType] int
+# 2775|                 Value = [Literal] 42
+# 2775|                 ValueCategory = prvalue
+# 2776|     getStmt(1): [DeclStmt] declaration
+# 2776|       getDeclarationEntry(0): [VariableDeclarationEntry] definition of p2
+# 2776|           Type = [PointerType] long *
+# 2776|         getVariable().getInitializer(): [Initializer] initializer for p2
+# 2776|           getExpr(): [NewExpr] new
+# 2776|               Type = [PointerType] long *
+# 2776|               ValueCategory = prvalue
+# 2776|             getInitializer(): [Literal] 42
+# 2776|                 Type = [IntType] int
+# 2776|                 Value = [Literal] 42
+# 2776|                 ValueCategory = prvalue
+# 2776|             getInitializer().getFullyConverted(): [CStyleCast] (long)...
+# 2776|                 Conversion = [IntegralConversion] integral conversion
+# 2776|                 Type = [LongType] long
+# 2776|                 Value = [CStyleCast] 42
+# 2776|                 ValueCategory = prvalue
+# 2777|     getStmt(2): [ReturnStmt] return ...
 ir23.cpp:
 #    1| [TopLevelFunction] bool consteval_1()
 #    1|   <params>: 
diff --git a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
index 6bf6801a48bd..d8babdb54e20 100644
--- a/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/aliased_ir.expected
@@ -20395,6 +20395,41 @@ ir.cpp:
 # 2769|     v2769_14(void)                  = AliasedUse                      : ~m2771_8
 # 2769|     v2769_15(void)                  = ExitFunction                    : 
 
+# 2774| void test_allocation_with_initializer()
+# 2774|   Block 0
+# 2774|     v2774_1(void)           = EnterFunction                 : 
+# 2774|     m2774_2(unknown)        = AliasedDefinition             : 
+# 2774|     m2774_3(unknown)        = InitializeNonLocal            : 
+# 2774|     m2774_4(unknown)        = Chi                           : total:m2774_2, partial:m2774_3
+# 2775|     r2775_1(glval<int *>)   = VariableAddress[p1]           : 
+# 2775|     r2775_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2775|     r2775_3(unsigned long)  = Constant[4]                   : 
+# 2775|     r2775_4(void *)         = Call[operator new]            : func:r2775_2, 0:r2775_3
+# 2775|     m2775_5(unknown)        = ^CallSideEffect               : ~m2774_4
+# 2775|     m2775_6(unknown)        = Chi                           : total:m2774_4, partial:m2775_5
+# 2775|     m2775_7(unknown)        = ^InitializeDynamicAllocation  : &:r2775_4
+# 2775|     r2775_8(int *)          = Convert                       : r2775_4
+# 2775|     r2775_9(int)            = Constant[42]                  : 
+# 2775|     m2775_10(int)           = Store[?]                      : &:r2775_8, r2775_9
+# 2775|     m2775_11(unknown)       = Chi                           : total:m2775_7, partial:m2775_10
+# 2775|     m2775_12(int *)         = Store[p1]                     : &:r2775_1, r2775_8
+# 2776|     r2776_1(glval<long *>)  = VariableAddress[p2]           : 
+# 2776|     r2776_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2776|     r2776_3(unsigned long)  = Constant[8]                   : 
+# 2776|     r2776_4(void *)         = Call[operator new]            : func:r2776_2, 0:r2776_3
+# 2776|     m2776_5(unknown)        = ^CallSideEffect               : ~m2775_6
+# 2776|     m2776_6(unknown)        = Chi                           : total:m2775_6, partial:m2776_5
+# 2776|     m2776_7(unknown)        = ^InitializeDynamicAllocation  : &:r2776_4
+# 2776|     r2776_8(long *)         = Convert                       : r2776_4
+# 2776|     r2776_9(long)           = Constant[42]                  : 
+# 2776|     m2776_10(long)          = Store[?]                      : &:r2776_8, r2776_9
+# 2776|     m2776_11(unknown)       = Chi                           : total:m2776_7, partial:m2776_10
+# 2776|     m2776_12(long *)        = Store[p2]                     : &:r2776_1, r2776_8
+# 2777|     v2777_1(void)           = NoOp                          : 
+# 2774|     v2774_5(void)           = ReturnVoid                    : 
+# 2774|     v2774_6(void)           = AliasedUse                    : ~m2776_6
+# 2774|     v2774_7(void)           = ExitFunction                  : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/ir/ir/ir.cpp b/cpp/ql/test/library-tests/ir/ir/ir.cpp
index 74c41c7e916b..66af788db12d 100644
--- a/cpp/ql/test/library-tests/ir/ir/ir.cpp
+++ b/cpp/ql/test/library-tests/ir/ir/ir.cpp
@@ -2771,4 +2771,9 @@ void test_three_way(int a, int b, ThreeWay c, ThreeWay d) {
   auto y = c <=> d;
 }
 
+void test_allocation_with_initializer() {
+    int* p1 = new int(42);
+    long* p2 = new long(42);
+}
+
 // semmle-extractor-options: -std=c++20 --clang
diff --git a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
index bf4cef8c3f49..a567c651ca24 100644
--- a/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
+++ b/cpp/ql/test/library-tests/ir/ir/raw_ir.expected
@@ -18547,6 +18547,36 @@ ir.cpp:
 # 2769|     v2769_13(void)                  = AliasedUse                      : ~m?
 # 2769|     v2769_14(void)                  = ExitFunction                    : 
 
+# 2774| void test_allocation_with_initializer()
+# 2774|   Block 0
+# 2774|     v2774_1(void)           = EnterFunction                 : 
+# 2774|     mu2774_2(unknown)       = AliasedDefinition             : 
+# 2774|     mu2774_3(unknown)       = InitializeNonLocal            : 
+# 2775|     r2775_1(glval<int *>)   = VariableAddress[p1]           : 
+# 2775|     r2775_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2775|     r2775_3(unsigned long)  = Constant[4]                   : 
+# 2775|     r2775_4(void *)         = Call[operator new]            : func:r2775_2, 0:r2775_3
+# 2775|     mu2775_5(unknown)       = ^CallSideEffect               : ~m?
+# 2775|     mu2775_6(unknown)       = ^InitializeDynamicAllocation  : &:r2775_4
+# 2775|     r2775_7(int *)          = Convert                       : r2775_4
+# 2775|     r2775_8(int)            = Constant[42]                  : 
+# 2775|     mu2775_9(int)           = Store[?]                      : &:r2775_7, r2775_8
+# 2775|     mu2775_10(int *)        = Store[p1]                     : &:r2775_1, r2775_7
+# 2776|     r2776_1(glval<long *>)  = VariableAddress[p2]           : 
+# 2776|     r2776_2(glval<unknown>) = FunctionAddress[operator new] : 
+# 2776|     r2776_3(unsigned long)  = Constant[8]                   : 
+# 2776|     r2776_4(void *)         = Call[operator new]            : func:r2776_2, 0:r2776_3
+# 2776|     mu2776_5(unknown)       = ^CallSideEffect               : ~m?
+# 2776|     mu2776_6(unknown)       = ^InitializeDynamicAllocation  : &:r2776_4
+# 2776|     r2776_7(long *)         = Convert                       : r2776_4
+# 2776|     r2776_8(long)           = Constant[42]                  : 
+# 2776|     mu2776_9(long)          = Store[?]                      : &:r2776_7, r2776_8
+# 2776|     mu2776_10(long *)       = Store[p2]                     : &:r2776_1, r2776_7
+# 2777|     v2777_1(void)           = NoOp                          : 
+# 2774|     v2774_4(void)           = ReturnVoid                    : 
+# 2774|     v2774_5(void)           = AliasedUse                    : ~m?
+# 2774|     v2774_6(void)           = ExitFunction                  : 
+
 ir23.cpp:
 #    1| bool consteval_1()
 #    1|   Block 0
diff --git a/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected b/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
index 0ddac7d27a6f..5a18945cc0f6 100644
--- a/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
+++ b/cpp/ql/test/library-tests/macros/arguments/macro_arguments.expected
@@ -23,7 +23,7 @@
 | test.c:27:17:33:1 | test.c:27:17:33:1 | CONCAT | 1 | "Semmle" | "Semmle" |
 | test.c:42:1:42:13 | test.c:42:1:42:13 | APPLY | 0 | top | top |
 | test.c:42:1:42:13 | test.c:42:1:42:13 | APPLY | 1 | 3 | 3 |
-| test.c:42:1:42:13 | test.c:42:7:41:24 | APPLY -> top | 0 | 3 | 3 |
+| test.c:42:1:42:13 | test.c:42:7:42:7 | APPLY -> top | 0 | 3 | 3 |
 | test.c:42:1:42:13 | top_and_nested.h:2:16:2:24 | APPLY -> top -> nested | 0 | 3 |  |
 | test.c:42:1:42:13 | top_and_nested.h:3:16:3:30 | APPLY -> top -> nested | 0 | 2 + (3) |  |
 | test.c:47:1:47:23 | test.c:45:15:45:22 | DECLARE_STRING -> ID | 0 | string1 | string1 |
@@ -49,7 +49,7 @@
 | test.c:82:1:82:4 | test.c:82:1:82:4 | ID | 0 |  |  |
 | test.c:84:5:84:20 | test.c:84:5:84:20 | APPLY | 0 | ID | ID |
 | test.c:84:5:84:20 | test.c:84:5:84:20 | APPLY | 1 | ID(1) | 1 |
-| test.c:84:5:84:20 | test.c:84:11:41:24 | APPLY -> ID | 0 | 1 | 1 |
+| test.c:84:5:84:20 | test.c:84:11:84:11 | APPLY -> ID | 0 | 1 | 1 |
 | test.c:84:5:84:20 | test.c:84:15:84:19 | APPLY -> ID | 0 | 1 | 1 |
 | test.c:85:21:85:40 | test.c:85:21:85:40 | CMD_LINE_MACRO | 0 | 5 | 5 |
 | test.c:85:21:85:40 | test.c:85:21:85:40 | CMD_LINE_MACRO | 1 | 6 | 6 |
diff --git a/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c
new file mode 100644
index 000000000000..4aef7d79eb57
--- /dev/null
+++ b/cpp/ql/test/query-tests/Security/CWE/CWE-457/semmle/tests/ms_vacopy.c
@@ -0,0 +1,8 @@
+#include <stdarg.h>
+
+int va_copy_test(va_list va) {
+    va_list va2;
+    va_copy(va2, va);
+    return 0;
+}
+// semmle-extractor-options: --microsoft
diff --git a/csharp/codeql-extractor.yml b/csharp/codeql-extractor.yml
index c4d7352cc439..786b78950ca1 100644
--- a/csharp/codeql-extractor.yml
+++ b/csharp/codeql-extractor.yml
@@ -10,6 +10,8 @@ build_modes:
   - autobuild
   - manual
   - none
+default_queries:
+  - codeql/csharp-queries
 github_api_languages:
   - C#
 scc_languages:
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index c276cd6133e6..7f3f4d436831 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.47
+
+No user-facing changes.
+
 ## 1.7.46
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md
new file mode 100644
index 000000000000..afc26600b73c
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.47.md
@@ -0,0 +1,3 @@
+## 1.7.47
+
+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 a39de8bc91c1..21f0fc0de3c1 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.46
+lastReleaseVersion: 1.7.47
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index d9430bc679ce..eec8eedc6568 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.46
+version: 1.7.47
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index c276cd6133e6..7f3f4d436831 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.47
+
+No user-facing changes.
+
 ## 1.7.46
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md
new file mode 100644
index 000000000000..afc26600b73c
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.47.md
@@ -0,0 +1,3 @@
+## 1.7.47
+
+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 a39de8bc91c1..21f0fc0de3c1 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.46
+lastReleaseVersion: 1.7.47
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index 747eaaec33b9..165e362e6c6f 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.46
+version: 1.7.47
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/consistency-queries/CfgConsistency.ql b/csharp/ql/consistency-queries/CfgConsistency.ql
index 3caf64f9aece..d7f0c091538d 100644
--- a/csharp/ql/consistency-queries/CfgConsistency.ql
+++ b/csharp/ql/consistency-queries/CfgConsistency.ql
@@ -29,7 +29,7 @@ predicate bbSuccInconsistency(ControlFlowElement pred, ControlFlowElement succ)
     succBB.getFirstNode() = succ.getAControlFlowNode()
   ) and
   not exists(PreBasicBlock predBB, PreBasicBlock succBB |
-    predBB.getLastElement() = pred and
+    predBB.getLastNode() = pred and
     succBB = predBB.getASuccessor() and
     succBB.getFirstElement() = succ
   )
@@ -41,12 +41,12 @@ predicate bbIntraSuccInconsistency(ControlFlowElement pred, ControlFlowElement s
     succ.getAControlFlowNode() = bb.getNode(i + 1)
   ) and
   not exists(PreBasicBlock bb |
-    bb.getLastElement() = pred and
+    bb.getLastNode() = pred and
     bb.getASuccessor().getFirstElement() = succ
   ) and
   not exists(PreBasicBlock bb, int i |
-    bb.getElement(i) = pred and
-    bb.getElement(i + 1) = succ
+    bb.getNode(i) = pred and
+    bb.getNode(i + 1) = succ
   )
 }
 
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 9e3686d8267d..0aca82e83107 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,12 @@
+## 5.2.3
+
+### Minor Analysis Improvements
+
+* A bug has been fixed in the data flow analysis, which means that flow through calls using the `base` qualifier may now be tracked more accurately.
+* Added summary models for `System.Xml.XmlReader`, `System.Xml.XmlTextReader` and `System.Xml.XmlDictionaryReader`.
+* Models-as-data summaries for byte and char arrays and pointers now treat the entire collection as tainted, reflecting their common use as string alternatives.
+* The default taint tracking configuration now allows implicit reads from collections at sinks and in additional flow steps. This increases flow coverage for many taint tracking queries and helps reduce false negatives.
+
 ## 5.2.2
 
 No user-facing changes.
diff --git a/csharp/ql/lib/change-notes/released/5.2.3.md b/csharp/ql/lib/change-notes/released/5.2.3.md
new file mode 100644
index 000000000000..b98913104193
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/5.2.3.md
@@ -0,0 +1,8 @@
+## 5.2.3
+
+### Minor Analysis Improvements
+
+* A bug has been fixed in the data flow analysis, which means that flow through calls using the `base` qualifier may now be tracked more accurately.
+* Added summary models for `System.Xml.XmlReader`, `System.Xml.XmlTextReader` and `System.Xml.XmlDictionaryReader`.
+* Models-as-data summaries for byte and char arrays and pointers now treat the entire collection as tainted, reflecting their common use as string alternatives.
+* The default taint tracking configuration now allows implicit reads from collections at sinks and in additional flow steps. This increases flow coverage for many taint tracking queries and helps reduce false negatives.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index e3b1b0c079d8..f7fd1ec5b57a 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.2.2
+lastReleaseVersion: 5.2.3
diff --git a/csharp/ql/lib/ext/System.IO.model.yml b/csharp/ql/lib/ext/System.IO.model.yml
index 0b8b52d9e8a5..549c324d66eb 100644
--- a/csharp/ql/lib/ext/System.IO.model.yml
+++ b/csharp/ql/lib/ext/System.IO.model.yml
@@ -77,7 +77,7 @@ extensions:
       - ["System.IO", "Path", False, "GetPathRoot", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System.IO", "Path", False, "GetPathRoot", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "Path", False, "GetRelativePath", "(System.String,System.String)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
-      - ["System.IO", "Stream", True, "BeginRead", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "BeginRead", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "BeginWrite", "(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", False, "CopyTo", "(System.IO.Stream)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "CopyTo", "(System.IO.Stream,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
@@ -85,17 +85,17 @@ extensions:
       - ["System.IO", "Stream", False, "CopyToAsync", "(System.IO.Stream,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "CopyToAsync", "(System.IO.Stream,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", False, "CopyToAsync", "(System.IO.Stream,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
-      - ["System.IO", "Stream", True, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "Read", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", False, "ReadAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadAsync", "(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "Read", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "Read", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", False, "ReadAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAsync", "(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "Stream", True, "ReadAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadAtLeast", "(System.Span<System.Byte>,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAsync", "(System.Memory<System.Byte>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadAtLeast", "(System.Span<System.Byte>,System.Int32,System.Boolean)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
       - ["System.IO", "Stream", True, "ReadAtLeastAsync", "(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadExactly", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "Stream", True, "ReadExactly", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadExactly", "(System.Span<System.Byte>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "Stream", True, "ReadExactly", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "Stream", True, "Write", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", True, "Write", "(System.ReadOnlySpan<System.Byte>)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
       - ["System.IO", "Stream", False, "WriteAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[0].Element", "Argument[this]", "taint", "manual"]
@@ -128,16 +128,16 @@ extensions:
       - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "StringWriter", True, "WriteLineAsync", "(System.Text.StringBuilder,System.Threading.CancellationToken)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.IO", "TextReader", True, "Read", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "Read", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "Read", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
-      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlock", "(System.Span<System.Char>)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       # Post-update nodes for `Memory<T>` are currently unsupported. This model is provided for completeness
-      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0].Element", "taint", "manual"]
+      - ["System.IO", "TextReader", True, "ReadBlockAsync", "(System.Memory<System.Char>,System.Threading.CancellationToken)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadLine", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadLineAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.IO", "TextReader", True, "ReadToEnd", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/System.Xml.model.yml b/csharp/ql/lib/ext/System.Xml.model.yml
index efea34b40dbe..a6ed8dd465d5 100644
--- a/csharp/ql/lib/ext/System.Xml.model.yml
+++ b/csharp/ql/lib/ext/System.Xml.model.yml
@@ -23,6 +23,17 @@ extensions:
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[1]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.IXmlDictionary,System.Xml.XmlDictionaryReaderQuotas,System.Xml.XmlBinaryReaderSession,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[3]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDictionaryReader", False, "CreateBinaryReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.Byte[],System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", False, "CreateTextReader", "(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBase64", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBinHex", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsBinHex", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadContentAsChars", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadElementContentAsBase64", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlDictionaryReader", True, "ReadElementContentAsBinHex", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
       - ["System.Xml", "XmlDocument", False, "Load", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
@@ -68,3 +79,68 @@ extensions:
       - ["System.Xml", "XmlReader", False, "Create", "(System.String,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlReader", False, "Create", "(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System.Xml", "XmlReader", False, "Create", "(System.Xml.XmlReader,System.Xml.XmlReaderSettings)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetAttribute", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "GetValueAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "LookupNamespace", "(System.String)", "", "Argument[0]", "ReturnValue", "value", "dfc-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBase64Async", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsBinHexAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsObjectAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadContentAsStringAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAs", "(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsAsync", "(System.Type,System.Xml.IXmlNamespaceResolver)", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBase64Async", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsBinHexAsync", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsObject", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsObject", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementContentAsString", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadElementString", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadInnerXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadInnerXmlAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadOuterXml", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadOuterXmlAsync", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadString", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadSubtree", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "ReadValueChunk", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "ReadValueChunkAsync", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlReader", True, "get_BaseURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.Int32)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Item", "(System.String,System.String)", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_LocalName", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Name", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_NameTable", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_NamespaceURI", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Prefix", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlReader", True, "get_SchemaInfo", "()", "", "Argument[this]", "ReturnValue", "value", "dfc-manual"]
+      - ["System.Xml", "XmlReader", True, "get_Value", "()", "", "Argument[this]", "ReturnValue", "taint", "df-manual"]
+      - ["System.Xml", "XmlTextReader", True, "GetNamespacesInScope", "(System.Xml.XmlNamespaceScope)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "GetRemainder", "()", "", "Argument[this]", "ReturnValue", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadBase64", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadBinHex", "(System.Byte[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", True, "ReadChars", "(System.Char[],System.Int32,System.Int32)", "", "Argument[this]", "Argument[0]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.Stream,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.IO.TextReader,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
+      - ["System.Xml", "XmlTextReader", False, "XmlTextReader", "(System.Xml.XmlNameTable)", "", "Argument[0]", "Argument[this]", "taint", "manual"]
diff --git a/csharp/ql/lib/ext/System.model.yml b/csharp/ql/lib/ext/System.model.yml
index 3853f03dc2fc..870413e75698 100644
--- a/csharp/ql/lib/ext/System.model.yml
+++ b/csharp/ql/lib/ext/System.model.yml
@@ -39,15 +39,15 @@ extensions:
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.Type,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.TypeCode)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ChangeType", "(System.Object,System.TypeCode,System.IFormatProvider)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "FromBase64CharArray", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromBase64String", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromHexString", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue.Element", "taint", "manual"]
-      - ["System", "Convert", False, "FromHexString", "(System.String)", "", "Argument[0]", "ReturnValue.Element", "taint", "manual"]
+      - ["System", "Convert", False, "FromBase64CharArray", "(System.Char[],System.Int32,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromBase64String", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromHexString", "(System.ReadOnlySpan<System.Char>)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
+      - ["System", "Convert", False, "FromHexString", "(System.String)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "GetTypeCode", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "IsDBNull", "(System.Object)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "Argument[3].Element", "taint", "manual"]
+      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "Argument[3]", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[3].Element", "taint", "manual"]
+      - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[3]", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64CharArray", "(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64String", "(System.Byte[])", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToBase64String", "(System.Byte[],System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
@@ -353,13 +353,13 @@ extensions:
       - ["System", "Convert", False, "ToUInt64", "(System.UInt16)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToUInt64", "(System.UInt32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
       - ["System", "Convert", False, "ToUInt64", "(System.UInt64)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64Chars", "(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryFromBase64String", "(System.String,System.Span<System.Byte>,System.Int32)", "", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[1].Element", "taint", "manual"]
+      - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[1]", "taint", "manual"]
       - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "Argument[2]", "taint", "manual"]
       - ["System", "Convert", False, "TryToBase64Chars", "(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
       - ["System", "Int32", False, "Parse", "(System.ReadOnlySpan<System.Char>,System.Globalization.NumberStyles,System.IFormatProvider)", "", "Argument[0].Element", "ReturnValue", "taint", "manual"]
diff --git a/csharp/ql/lib/printAst.ql b/csharp/ql/lib/printAst.ql
index 380f4b4024bb..85820796a881 100644
--- a/csharp/ql/lib/printAst.ql
+++ b/csharp/ql/lib/printAst.ql
@@ -18,8 +18,8 @@ external string selectedSourceFile();
 
 class PrintAstConfigurationOverride extends PrintAstConfiguration {
   /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `fromSource`.
+   * Holds if the location `l` matches the selected file in the VS Code extension and
+   * the element is `e` is `fromSource`.
    */
   override predicate shouldPrint(Element e, Location l) {
     super.shouldPrint(e, l) and
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index e37dc80836f0..2ecc1490cf54 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 5.2.2
+version: 5.2.3
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/lib/semmle/code/csharp/Assignable.qll b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
index d4f8d9974f08..3c7170a6f846 100644
--- a/csharp/ql/lib/semmle/code/csharp/Assignable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Assignable.qll
@@ -583,7 +583,7 @@ module AssignableDefinitions {
   }
 
   /**
-   * Holds if the `ref` assignment to `aa` via call `c` is uncertain.
+   * Holds if the `ref` assignment to `arg` via call `c` is uncertain.
    */
   // Not in the cached module `Cached`, as that would introduce a dependency
   // on the CFG construction, and effectively collapse too many stages into one
diff --git a/csharp/ql/lib/semmle/code/csharp/Callable.qll b/csharp/ql/lib/semmle/code/csharp/Callable.qll
index 6384f4582769..7e17f853913a 100644
--- a/csharp/ql/lib/semmle/code/csharp/Callable.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Callable.qll
@@ -708,7 +708,7 @@ class TrueOperator extends UnaryOperator {
  *
  * Either an addition operator (`AddOperator`), a checked addition operator
  * (`CheckedAddOperator`) a subtraction operator (`SubOperator`), a checked
- * substraction operator (`CheckedSubOperator`), a multiplication operator
+ * subtraction operator (`CheckedSubOperator`), a multiplication operator
  * (`MulOperator`), a checked multiplication operator (`CheckedMulOperator`),
  * a division operator (`DivOperator`), a checked division operator
  * (`CheckedDivOperator`), a remainder operator (`RemOperator`), an and
diff --git a/csharp/ql/lib/semmle/code/csharp/Member.qll b/csharp/ql/lib/semmle/code/csharp/Member.qll
index 3427d4ea0893..a196d3b3fc70 100644
--- a/csharp/ql/lib/semmle/code/csharp/Member.qll
+++ b/csharp/ql/lib/semmle/code/csharp/Member.qll
@@ -491,7 +491,7 @@ class Parameterizable extends Declaration, @parameterizable {
   final Parameter getARawParameter() { result = this.getRawParameter(_) }
 
   /**
-   * Gets the type of the parameter, possibly prefixed
+   * Gets the type of the `i`th parameter, possibly prefixed
    * with `out`, `ref`, or `params`, where appropriate.
    */
   private string parameterTypeToString(int i) {
diff --git a/csharp/ql/lib/semmle/code/csharp/PrintAst.qll b/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
index fd4bf1cb86b0..1ac96c85e788 100644
--- a/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
+++ b/csharp/ql/lib/semmle/code/csharp/PrintAst.qll
@@ -523,11 +523,9 @@ final class AttributeNode extends ElementNode {
  * A node representing a `TypeParameter`.
  */
 final class TypeParameterNode extends ElementNode {
-  TypeParameter typeParameter;
-
   TypeParameterNode() {
-    typeParameter = element and
-    not isNotNeeded(typeParameter.getDeclaringGeneric())
+    element =
+      any(TypeParameter typeParameter | not isNotNeeded(typeParameter.getDeclaringGeneric()))
   }
 
   override ElementNode getChild(int childIndex) { none() }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
index 9e548838adec..c3bf2545230c 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/BasicBlocks.qll
@@ -6,6 +6,7 @@ import csharp
 private import ControlFlow::SuccessorTypes
 private import semmle.code.csharp.controlflow.internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -13,7 +14,12 @@ private import CfgImpl::BasicBlocks as BasicBlocksImpl
  */
 final class BasicBlock extends BasicBlocksImpl::BasicBlock {
   /** Gets an immediate successor of this basic block of a given type, if any. */
-  BasicBlock getASuccessorByType(ControlFlow::SuccessorType t) { result = this.getASuccessor(t) }
+  BasicBlock getASuccessor(ControlFlow::SuccessorType t) { result = super.getASuccessor(t) }
+
+  /** DEPRECATED: Use `getASuccessor` instead. */
+  deprecated BasicBlock getASuccessorByType(ControlFlow::SuccessorType t) {
+    result = this.getASuccessor(t)
+  }
 
   /** Gets an immediate predecessor of this basic block of a given type, if any. */
   BasicBlock getAPredecessorByType(ControlFlow::SuccessorType t) {
@@ -58,6 +64,8 @@ final class BasicBlock extends BasicBlocksImpl::BasicBlock {
     result.getFirstNode() = this.getLastNode().getAFalseSuccessor()
   }
 
+  BasicBlock getASuccessor() { result = super.getASuccessor() }
+
   /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
   ControlFlow::Node getNode(int pos) { result = super.getNode(pos) }
 
@@ -330,3 +338,21 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlow::Node;
+
+  class SuccessorType = ControlFlow::SuccessorType;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
index 5649f43b8818..1cd09725b6e0 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/ControlFlowElement.qll
@@ -90,7 +90,7 @@ class ControlFlowElement extends ExprOrStmtParent, @control_flow_element {
     // all other nodes can use regular CFG dominance
     this instanceof Impl::SplitAstNode and
     cb.getLastNode() = this.getAControlFlowNode() and
-    succ = cb.getASuccessorByType(s)
+    succ = cb.getASuccessor(s)
   }
 
   pragma[noinline]
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
index 313fabc02356..2688472f71c3 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/Guards.qll
@@ -999,7 +999,7 @@ module Internal {
     pragma[nomagic]
     private predicate preControlsDirect(Guard g, PreBasicBlocks::PreBasicBlock bb, AbstractValue v) {
       exists(PreBasicBlocks::ConditionBlock cb, ConditionalSuccessor s | cb.controls(bb, s) |
-        v.branch(cb.getLastElement(), s, g)
+        v.branch(cb.getLastNode(), s, g)
       )
     }
 
@@ -1146,9 +1146,9 @@ module Internal {
     /** Gets the successor block that is reached when guard `g` has abstract value `v`. */
     private PreBasicBlocks::PreBasicBlock getConditionalSuccessor(Guard g, AbstractValue v) {
       exists(PreBasicBlocks::ConditionBlock pred, ConditionalSuccessor s |
-        v.branch(pred.getLastElement(), s, g)
+        v.branch(pred.getLastNode(), s, g)
       |
-        result = pred.getASuccessorByType(s)
+        result = pred.getASuccessor(s)
       )
     }
 
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 6fed45cdf84d..a3bf97945964 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Completion.qll
@@ -310,10 +310,8 @@ private class Overflowable extends UnaryOperation {
 
 /** A control flow element that is inside a `try` block. */
 private class TriedControlFlowElement extends ControlFlowElement {
-  TryStmt try;
-
   TriedControlFlowElement() {
-    this = try.getATriedElement() and
+    this = any(TryStmt try).getATriedElement() and
     not this instanceof NonReturningCall
   }
 
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
index 08debc21c0d0..b3cdf3335e66 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreBasicBlocks.qll
@@ -13,6 +13,7 @@ import csharp
 private import Completion
 private import ControlFlowGraphImpl
 private import semmle.code.csharp.controlflow.ControlFlowGraph::ControlFlow as Cfg
+private import codeql.controlflow.BasicBlock as BB
 
 private predicate startsBB(ControlFlowElement cfe) {
   not succ(_, cfe, _) and
@@ -55,24 +56,34 @@ private predicate bbIDominates(PreBasicBlock dom, PreBasicBlock bb) =
 class PreBasicBlock extends ControlFlowElement {
   PreBasicBlock() { startsBB(this) }
 
-  PreBasicBlock getASuccessorByType(Cfg::SuccessorType t) {
-    succ(this.getLastElement(), result, any(Completion c | t = c.getAMatchingSuccessorType()))
+  PreBasicBlock getASuccessor(Cfg::SuccessorType t) {
+    succ(this.getLastNode(), result, any(Completion c | t = c.getAMatchingSuccessorType()))
   }
 
-  PreBasicBlock getASuccessor() { result = this.getASuccessorByType(_) }
+  deprecated PreBasicBlock getASuccessorByType(Cfg::SuccessorType t) {
+    result = this.getASuccessor(t)
+  }
+
+  PreBasicBlock getASuccessor() { result = this.getASuccessor(_) }
 
   PreBasicBlock getAPredecessor() { result.getASuccessor() = this }
 
-  ControlFlowElement getElement(int pos) { bbIndex(this, result, pos) }
+  ControlFlowElement getNode(int pos) { bbIndex(this, result, pos) }
 
-  ControlFlowElement getAnElement() { result = this.getElement(_) }
+  deprecated ControlFlowElement getElement(int pos) { result = this.getNode(pos) }
+
+  ControlFlowElement getAnElement() { result = this.getNode(_) }
 
   ControlFlowElement getFirstElement() { result = this }
 
-  ControlFlowElement getLastElement() { result = this.getElement(this.length() - 1) }
+  ControlFlowElement getLastNode() { result = this.getNode(this.length() - 1) }
+
+  deprecated ControlFlowElement getLastElement() { result = this.getLastNode() }
 
   int length() { result = strictcount(this.getAnElement()) }
 
+  PreBasicBlock getImmediateDominator() { bbIDominates(result, this) }
+
   predicate immediatelyDominates(PreBasicBlock bb) { bbIDominates(this, bb) }
 
   pragma[inline]
@@ -84,45 +95,83 @@ class PreBasicBlock extends ControlFlowElement {
     or
     this.strictlyDominates(bb)
   }
+
+  predicate inDominanceFrontier(PreBasicBlock df) {
+    this = df.getAPredecessor() and not bbIDominates(this, df)
+    or
+    exists(PreBasicBlock prev | prev.inDominanceFrontier(df) |
+      bbIDominates(this, prev) and
+      not bbIDominates(this, df)
+    )
+  }
+
+  /** Unsupported. Do not use. */
+  predicate strictlyPostDominates(PreBasicBlock bb) { none() }
+
+  /** Unsupported. Do not use. */
+  predicate postDominates(PreBasicBlock bb) {
+    this.strictlyPostDominates(bb) or
+    this = bb
+  }
 }
 
 private Completion getConditionalCompletion(ConditionalCompletion cc) {
   result.getInnerCompletion() = cc
 }
 
+pragma[nomagic]
+private predicate conditionBlockImmediatelyControls(
+  ConditionBlock cond, PreBasicBlock succ, ConditionalCompletion cc
+) {
+  exists(ControlFlowElement last, Completion c |
+    last = cond.getLastNode() and
+    c = getConditionalCompletion(cc) and
+    succ(last, succ, c) and
+    // In the pre-CFG, we need to account for case where one predecessor node has
+    // two edges to the same successor node. Assertion expressions are examples of
+    // such nodes.
+    not exists(Completion other |
+      succ(last, succ, other) and
+      other != c
+    ) and
+    forall(PreBasicBlock pred | pred = succ.getAPredecessor() and pred != cond |
+      succ.dominates(pred)
+    )
+  )
+}
+
 class ConditionBlock extends PreBasicBlock {
   ConditionBlock() {
     exists(Completion c | c = getConditionalCompletion(_) |
-      succ(this.getLastElement(), _, c)
+      succ(this.getLastNode(), _, c)
       or
-      scopeLast(_, this.getLastElement(), c)
-    )
-  }
-
-  pragma[nomagic]
-  private predicate immediatelyControls(PreBasicBlock succ, ConditionalCompletion cc) {
-    exists(ControlFlowElement last, Completion c |
-      last = this.getLastElement() and
-      c = getConditionalCompletion(cc) and
-      succ(last, succ, c) and
-      // In the pre-CFG, we need to account for case where one predecessor node has
-      // two edges to the same successor node. Assertion expressions are examples of
-      // such nodes.
-      not exists(Completion other |
-        succ(last, succ, other) and
-        other != c
-      ) and
-      forall(PreBasicBlock pred | pred = succ.getAPredecessor() and pred != this |
-        succ.dominates(pred)
-      )
+      scopeLast(_, this.getLastNode(), c)
     )
   }
 
   pragma[nomagic]
   predicate controls(PreBasicBlock controlled, Cfg::SuccessorTypes::ConditionalSuccessor s) {
-    exists(PreBasicBlock succ, ConditionalCompletion c | this.immediatelyControls(succ, c) |
+    exists(PreBasicBlock succ, ConditionalCompletion c |
+      conditionBlockImmediatelyControls(this, succ, c)
+    |
       succ.dominates(controlled) and
       s = c.getAMatchingSuccessorType()
     )
   }
 }
+
+module PreCfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowElement;
+
+  class SuccessorType = Cfg::SuccessorType;
+
+  class BasicBlock = PreBasicBlock;
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { entryBB(this) }
+  }
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    conditionBlockImmediatelyControls(bb1, bb2, _)
+  }
+}
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
index 6507bbbe04bf..ce9fdd406fd8 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/PreSsa.qll
@@ -12,9 +12,9 @@ module PreSsa {
   private import codeql.ssa.Ssa as SsaImplCommon
 
   private predicate definitionAt(
-    AssignableDefinition def, SsaInput::BasicBlock bb, int i, SsaInput::SourceVariable v
+    AssignableDefinition def, PreBasicBlocks::PreBasicBlock bb, int i, SsaInput::SourceVariable v
   ) {
-    bb.getElement(i) = def.getExpr() and
+    bb.getNode(i) = def.getExpr() and
     v = def.getTarget() and
     // In cases like `(x, x) = (0, 1)`, we discard the first (dead) definition of `x`
     not exists(TupleAssignmentDefinition first, TupleAssignmentDefinition second | first = def |
@@ -30,7 +30,9 @@ module PreSsa {
     )
   }
 
-  predicate implicitEntryDef(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v) {
+  predicate implicitEntryDef(
+    Callable c, PreBasicBlocks::PreBasicBlock bb, SsaInput::SourceVariable v
+  ) {
     c = v.getACallable() and
     scopeFirst(c, bb) and
     (
@@ -79,19 +81,9 @@ module PreSsa {
     }
   }
 
-  module SsaInput implements SsaImplCommon::InputSig<Location> {
-    class BasicBlock extends PreBasicBlocks::PreBasicBlock {
-      ControlFlowNode getNode(int i) { result = this.getElement(i) }
-    }
-
-    class ControlFlowNode = ControlFlowElement;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
-    private class ExitBasicBlock extends BasicBlock {
-      ExitBasicBlock() { scopeLast(_, this.getLastElement(), _) }
+  module SsaInput implements SsaImplCommon::InputSig<Location, PreBasicBlocks::PreBasicBlock> {
+    private class ExitBasicBlock extends PreBasicBlocks::PreBasicBlock {
+      ExitBasicBlock() { scopeLast(_, this.getLastNode(), _) }
     }
 
     pragma[noinline]
@@ -129,7 +121,9 @@ module PreSsa {
       Callable getACallable() { result = c }
     }
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(
+      PreBasicBlocks::PreBasicBlock bb, int i, SourceVariable v, boolean certain
+    ) {
       exists(AssignableDefinition def |
         definitionAt(def, bb, i, v) and
         if def.getTargetAccess().isRefArgument() then certain = false else certain = true
@@ -140,9 +134,11 @@ module PreSsa {
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(
+      PreBasicBlocks::PreBasicBlock bb, int i, SourceVariable v, boolean certain
+    ) {
       exists(AssignableRead read |
-        read = bb.getElement(i) and
+        read = bb.getNode(i) and
         read.getTarget() = v and
         certain = true
       )
@@ -157,27 +153,27 @@ module PreSsa {
     }
   }
 
-  private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  private module SsaImpl = SsaImplCommon::Make<Location, PreBasicBlocks::PreCfg, SsaInput>;
 
   class Definition extends SsaImpl::Definition {
     final AssignableRead getARead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i |
         SsaImpl::ssaDefReachesRead(_, this, bb, i) and
-        result = bb.getElement(i)
+        result = bb.getNode(i)
       )
     }
 
     final AssignableDefinition getDefinition() {
-      exists(SsaInput::BasicBlock bb, int i, SsaInput::SourceVariable v |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i, SsaInput::SourceVariable v |
         this.definesAt(v, bb, i) and
         definitionAt(result, bb, i, v)
       )
     }
 
     final AssignableRead getAFirstRead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(PreBasicBlocks::PreBasicBlock bb, int i |
         SsaImpl::firstUse(this, bb, i, true) and
-        result = bb.getElement(i)
+        result = bb.getNode(i)
       )
     }
 
@@ -191,14 +187,14 @@ module PreSsa {
       not result instanceof PhiNode
     }
 
-    final predicate isLiveAtEndOfBlock(SsaInput::BasicBlock bb) {
+    final predicate isLiveAtEndOfBlock(PreBasicBlocks::PreBasicBlock bb) {
       SsaImpl::ssaDefReachesEndOfBlock(bb, this, _)
     }
 
     override Location getLocation() {
       result = this.getDefinition().getLocation()
       or
-      exists(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v |
+      exists(Callable c, PreBasicBlocks::PreBasicBlock bb, SsaInput::SourceVariable v |
         this.definesAt(v, bb, -1) and
         implicitEntryDef(c, bb, v) and
         result = c.getLocation()
@@ -213,10 +209,10 @@ module PreSsa {
   }
 
   predicate adjacentReadPairSameVar(AssignableRead read1, AssignableRead read2) {
-    exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
-      read1 = bb1.getElement(i1) and
+    exists(PreBasicBlocks::PreBasicBlock bb1, int i1, PreBasicBlocks::PreBasicBlock bb2, int i2 |
+      read1 = bb1.getNode(i1) and
       SsaImpl::adjacentUseUse(bb1, i1, bb2, i2, _, true) and
-      read2 = bb2.getElement(i2)
+      read2 = bb2.getNode(i2)
     )
   }
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
index b6efdfcf1eac..f57dd0703fce 100644
--- a/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
+++ b/csharp/ql/lib/semmle/code/csharp/controlflow/internal/Splitting.qll
@@ -899,7 +899,7 @@ module BooleanSplitting {
 
     /** Holds if control flow element `cfe` starts a split of this kind. */
     predicate startsSplit(AstNode cfe) {
-      this.correlatesConditions(any(ConditionBlock cb | cb.getLastElement() = cfe), _, _)
+      this.correlatesConditions(any(ConditionBlock cb | cb.getLastNode() = cfe), _, _)
     }
 
     /**
@@ -941,7 +941,7 @@ module BooleanSplitting {
     /**
      * Holds if condition `cb` is a read of the SSA variable in this split.
      */
-    private predicate defCondition(ConditionBlock cb) { cb.getLastElement() = def.getARead() }
+    private predicate defCondition(ConditionBlock cb) { cb.getLastNode() = def.getARead() }
 
     /**
      * Holds if condition `cb` is a read of the SSA variable in this split,
@@ -950,7 +950,7 @@ module BooleanSplitting {
      */
     private predicate defConditionReachableFromRead(ConditionBlock cb, AssignableRead read) {
       this.defCondition(cb) and
-      read = cb.getLastElement()
+      read = cb.getLastNode()
       or
       exists(AssignableRead mid | this.defConditionReachableFromRead(cb, mid) |
         PreSsa::adjacentReadPairSameVar(read, mid) and
@@ -970,9 +970,9 @@ module BooleanSplitting {
     override predicate correlatesConditions(ConditionBlock cb1, ConditionBlock cb2, boolean inverted) {
       this.firstDefCondition(cb1) and
       exists(AssignableRead read1, AssignableRead read2 |
-        read1 = cb1.getLastElement() and
+        read1 = cb1.getLastNode() and
         PreSsa::adjacentReadPairSameVar+(read1, read2) and
-        read2 = cb2.getLastElement() and
+        read2 = cb2.getLastNode() and
         inverted = false
       )
     }
@@ -1088,7 +1088,7 @@ module BooleanSplitting {
      */
     private predicate appliesToBlock(PreBasicBlock bb, Completion c) {
       this.appliesTo(bb) and
-      exists(AstNode last | last = bb.getLastElement() |
+      exists(AstNode last | last = bb.getLastNode() |
         (succ(last, _, c) or scopeLast(_, last, c)) and
         // Respect the value recorded in this split for all correlated conditions
         forall(boolean inverted | bb = this.getACorrelatedCondition(inverted) |
@@ -1102,7 +1102,7 @@ module BooleanSplitting {
 
     override predicate hasExit(AstNode pred, AstNode succ, Completion c) {
       exists(PreBasicBlock bb | this.appliesToBlock(bb, c) |
-        pred = bb.getLastElement() and
+        pred = bb.getLastNode() and
         succ(pred, succ, c) and
         // Exit this split if we can no longer reach a correlated condition
         not super.getSubKind().canReachCorrelatedCondition(succ)
@@ -1111,7 +1111,7 @@ module BooleanSplitting {
 
     override predicate hasExitScope(CfgScope scope, AstNode last, Completion c) {
       exists(PreBasicBlock bb | this.appliesToBlock(bb, c) |
-        last = bb.getLastElement() and
+        last = bb.getLastNode() and
         scopeLast(scope, last, c)
       )
     }
@@ -1121,7 +1121,7 @@ module BooleanSplitting {
         pred = bb.getAnElement() and
         this.appliesSucc(pred, succ, c) and
         (
-          pred = bb.getLastElement()
+          pred = bb.getLastNode()
           implies
           (
             // We must still be able to reach a correlated condition to stay in this split
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
index 7e8ed0aadc04..352418779955 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/Nullness.qll
@@ -297,7 +297,7 @@ private predicate defNullImpliesStep(
   not exists(SuccessorTypes::ConditionalSuccessor s, NullValue nv |
     bb1.getLastNode() = getANullCheck(def1, s, nv).getAControlFlowNode()
   |
-    bb2 = bb1.getASuccessorByType(s) and
+    bb2 = bb1.getASuccessor(s) and
     nv.isNonNull()
   )
 }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
index f17317af83be..4c9f64de4b9e 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/SSA.qll
@@ -451,10 +451,9 @@ module Ssa {
    * An SSA definition that corresponds to an explicit assignable definition.
    */
   class ExplicitDefinition extends Definition, SsaImpl::WriteDefinition {
-    SourceVariable sv;
     AssignableDefinition ad;
 
-    ExplicitDefinition() { SsaImpl::explicitDefinition(this, sv, ad) }
+    ExplicitDefinition() { SsaImpl::explicitDefinition(this, _, ad) }
 
     /**
      * Gets an underlying assignable definition. The result is always unique,
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
index ec1b5a0188e8..6e2d7d239f78 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/BaseSSA.qll
@@ -5,6 +5,7 @@ import csharp
  */
 module BaseSsa {
   private import AssignableDefinitions
+  private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
   private import codeql.ssa.Ssa as SsaImplCommon
 
   /**
@@ -42,22 +43,12 @@ module BaseSsa {
     )
   }
 
-  private module SsaInput implements SsaImplCommon::InputSig<Location> {
+  private module SsaInput implements SsaImplCommon::InputSig<Location, ControlFlow::BasicBlock> {
     private import semmle.code.csharp.controlflow.internal.PreSsa
 
-    class BasicBlock = ControlFlow::BasicBlock;
-
-    class ControlFlowNode = ControlFlow::Node;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     class SourceVariable = PreSsa::SimpleLocalScopeVariable;
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(ControlFlow::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignableDefinition def |
         definitionAt(def, bb, i, v) and
         if def.isCertain() then certain = true else certain = false
@@ -68,7 +59,7 @@ module BaseSsa {
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(ControlFlow::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignableRead read |
         read.getAControlFlowNode() = bb.getNode(i) and
         read.getTarget() = v and
@@ -77,7 +68,7 @@ module BaseSsa {
     }
   }
 
-  private module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  private module SsaImpl = SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput>;
 
   class Definition extends SsaImpl::Definition {
     final AssignableRead getARead() {
@@ -114,7 +105,7 @@ module BaseSsa {
     override Location getLocation() {
       result = this.getDefinition().getLocation()
       or
-      exists(Callable c, SsaInput::BasicBlock bb, SsaInput::SourceVariable v |
+      exists(Callable c, ControlFlow::BasicBlock bb, SsaInput::SourceVariable v |
         this.definesAt(v, bb, -1) and
         implicitEntryDef(c, bb, v) and
         result = c.getLocation()
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 9373c46466a0..f9563ef9fe5d 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowPrivate.qll
@@ -264,6 +264,7 @@ predicate hasNodePath(ControlFlowReachabilityConfiguration conf, ExprNode n1, No
 /** Provides logic related to captured variables. */
 module VariableCapture {
   private import codeql.dataflow.VariableCapture as Shared
+  private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(ControlFlow::Nodes::ExprNode e1, ControlFlow::Nodes::ExprNode e2) {
     e1 = LocalFlow::getALastEvalNode(e2)
@@ -275,24 +276,15 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements Shared::InputSig<Location> {
+  private module CaptureInput implements Shared::InputSig<Location, BasicBlocks::BasicBlock> {
     private import csharp as Cs
     private import semmle.code.csharp.controlflow.ControlFlowGraph as Cfg
-    private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
     private import TaintTrackingPrivate as TaintTrackingPrivate
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = super.getCallable() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::BasicBlock bb) {
+      result = bb.getCallable()
     }
 
-    class ControlFlowNode = Cfg::ControlFlow::Node;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     private predicate thisAccess(ControlFlow::Node cfn, InstanceCallable c) {
       ThisFlow::thisAccessExpr(cfn.getAstNode()) and
       cfn.getEnclosingCallable().getEnclosingCallable*() = c
@@ -359,7 +351,7 @@ module VariableCapture {
     }
 
     class Expr extends ControlFlow::Node {
-      predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+      predicate hasCfgNode(BasicBlocks::BasicBlock bb, int i) { this = bb.getNode(i) }
     }
 
     class VariableWrite extends Expr {
@@ -411,7 +403,7 @@ module VariableCapture {
 
   class ClosureExpr = CaptureInput::ClosureExpr;
 
-  module Flow = Shared::Flow<Location, CaptureInput>;
+  module Flow = Shared::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
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 d1490c849163..d3f1a9d956bb 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll
@@ -6,17 +6,10 @@ import csharp
 private import codeql.ssa.Ssa as SsaImplCommon
 private import AssignableDefinitions
 private import semmle.code.csharp.controlflow.internal.PreSsa
+private import semmle.code.csharp.controlflow.BasicBlocks as BasicBlocks
 private import semmle.code.csharp.controlflow.Guards as Guards
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  class BasicBlock = ControlFlow::BasicBlock;
-
-  class ControlFlowNode = ControlFlow::Node;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+private module SsaInput implements SsaImplCommon::InputSig<Location, ControlFlow::BasicBlock> {
   class SourceVariable = Ssa::SourceVariable;
 
   /**
@@ -25,7 +18,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    *
    * This includes implicit writes via calls.
    */
-  predicate variableWrite(BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
+  predicate variableWrite(ControlFlow::BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
     variableWriteDirect(bb, i, v, certain)
     or
     variableWriteQualifier(bb, i, v, certain)
@@ -39,7 +32,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
    *
    * This includes implicit reads via calls.
    */
-  predicate variableRead(BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
+  predicate variableRead(ControlFlow::BasicBlock bb, int i, Ssa::SourceVariable v, boolean certain) {
     variableReadActual(bb, i, v) and
     certain = true
     or
@@ -48,7 +41,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -150,7 +143,7 @@ private module SourceVariableImpl {
   }
 
   /**
-   * Gets an `out`/`ref` definition of the same source variable as the `out`/`ref`
+   * Gets an `out`/`ref` definition of the same source variable `v` as the `out`/`ref`
    * definition `def`, belonging to the same call, at a position after `def`.
    */
   OutRefDefinition getASameOutRefDefAfter(Ssa::SourceVariable v, OutRefDefinition def) {
@@ -729,7 +722,7 @@ private predicate variableReadPseudo(ControlFlow::BasicBlock bb, int i, Ssa::Sou
 
 pragma[noinline]
 deprecated private predicate adjacentDefRead(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
+  Definition def, ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2,
   SsaInput::SourceVariable v
 ) {
   Impl::adjacentDefRead(def, bb1, i1, bb2, i2) and
@@ -737,8 +730,8 @@ deprecated private predicate adjacentDefRead(
 }
 
 deprecated private predicate adjacentDefReachesRead(
-  Definition def, SsaInput::SourceVariable v, SsaInput::BasicBlock bb1, int i1,
-  SsaInput::BasicBlock bb2, int i2
+  Definition def, SsaInput::SourceVariable v, ControlFlow::BasicBlock bb1, int i1,
+  ControlFlow::BasicBlock bb2, int i2
 ) {
   adjacentDefRead(def, bb1, i1, bb2, i2, v) and
   (
@@ -747,7 +740,7 @@ deprecated private predicate adjacentDefReachesRead(
     SsaInput::variableRead(bb1, i1, v, true)
   )
   or
-  exists(SsaInput::BasicBlock bb3, int i3 |
+  exists(ControlFlow::BasicBlock bb3, int i3 |
     adjacentDefReachesRead(def, v, bb1, i1, bb3, i3) and
     SsaInput::variableRead(bb3, i3, _, false) and
     Impl::adjacentDefRead(def, bb3, i3, bb2, i2)
@@ -755,7 +748,7 @@ deprecated private predicate adjacentDefReachesRead(
 }
 
 deprecated private predicate adjacentDefReachesUncertainRead(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, ControlFlow::BasicBlock bb1, int i1, ControlFlow::BasicBlock bb2, int i2
 ) {
   exists(SsaInput::SourceVariable v |
     adjacentDefReachesRead(def, v, bb1, i1, bb2, i2) and
@@ -766,12 +759,12 @@ deprecated private predicate adjacentDefReachesUncertainRead(
 /** Same as `lastRefRedef`, but skips uncertain reads. */
 pragma[nomagic]
 deprecated private predicate lastRefSkipUncertainReads(
-  Definition def, SsaInput::BasicBlock bb, int i
+  Definition def, ControlFlow::BasicBlock bb, int i
 ) {
   Impl::lastRef(def, bb, i) and
   not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
   or
-  exists(SsaInput::BasicBlock bb0, int i0 |
+  exists(ControlFlow::BasicBlock bb0, int i0 |
     Impl::lastRef(def, bb0, i0) and
     adjacentDefReachesUncertainRead(def, bb, i, bb0, i0)
   )
@@ -1054,7 +1047,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
     predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(ControlFlow::SuccessorTypes::ConditionalSuccessor s |
         this.getAControlFlowNode() = bb1.getLastNode() and
-        bb2 = bb1.getASuccessorByType(s) and
+        bb2 = bb1.getASuccessor(s) and
         s.getValue() = branch
       )
     }
diff --git a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
index b7681994e2c3..3146720efe86 100644
--- a/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dataflow/internal/TaintTrackingPrivate.qll
@@ -29,7 +29,10 @@ predicate defaultTaintSanitizer(DataFlow::Node node) {
  * of `c` at sinks and inputs to additional taint steps.
  */
 bindingset[node]
-predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c) { none() }
+predicate defaultImplicitTaintRead(DataFlow::Node node, DataFlow::ContentSet c) {
+  exists(node) and
+  c.isElement()
+}
 
 private class LocalTaintExprStepConfiguration extends ControlFlowReachabilityConfiguration {
   LocalTaintExprStepConfiguration() { this = "LocalTaintExprStepConfiguration" }
diff --git a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
index 7de6c30eb13c..c61ad0f2a2a9 100644
--- a/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
+++ b/csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll
@@ -270,6 +270,14 @@ private module Internal {
     hasOverrider(t, c)
   }
 
+  /**
+   * For `base` expressions, the extractor provides the type of the base
+   * class instead of the derived class; this predicate provides the latter.
+   */
+  private Type getBaseAdjustedType(BaseAccess base) {
+    result = base.getEnclosingCallable().getDeclaringType()
+  }
+
   abstract private class DispatchOverridableCall extends DispatchCallImpl {
     pragma[noinline]
     OverridableCallable getAStaticTargetExt() {
@@ -360,7 +368,12 @@ private module Internal {
     private predicate contextArgHasType(DispatchCall ctx, Type t, boolean isExact) {
       exists(Expr arg, int i |
         this.relevantContext(ctx, i) and
-        t = getAPossibleType(arg, isExact)
+        (
+          t = getBaseAdjustedType(arg) and isExact = false
+          or
+          not exists(getBaseAdjustedType(arg)) and
+          t = getAPossibleType(arg, isExact)
+        )
       |
         ctx.getArgument(i) = arg
         or
@@ -725,9 +738,7 @@ private module Internal {
 
       Type getType(boolean isExact) {
         result = this.getType() and
-        if
-          this instanceof ObjectCreation or
-          this instanceof BaseAccess
+        if this instanceof ObjectCreation or this instanceof BaseAccess
         then isExact = true
         else isExact = false
       }
diff --git a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
index 27f6ab6935f7..5b2bd407a5ce 100644
--- a/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
+++ b/csharp/ql/lib/semmle/code/csharp/security/dataflow/UnsafeDeserializationQuery.qll
@@ -874,7 +874,7 @@ private predicate isStrongTypeFsPicklerCall(MethodCall mc, Method m) {
   (
     m instanceof FsPicklerSerializerClassDeserializeMethod or
     m instanceof FsPicklerSerializerClassDeserializeSequenceMethod or
-    m instanceof FsPicklerSerializerClasDeserializeSiftedMethod or
+    m instanceof FsPicklerSerializerClassDeserializeSiftedMethod or
     m instanceof FsPicklerSerializerClassUnPickleMethod or
     m instanceof FsPicklerSerializerClassUnPickleSiftedMethod or
     m instanceof CsPicklerSerializerClassDeserializeMethod or
diff --git a/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll b/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
index aeb341222844..f7c6ade96eaf 100644
--- a/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
+++ b/csharp/ql/lib/semmle/code/csharp/serialization/Deserializers.qll
@@ -560,9 +560,15 @@ class FsPicklerSerializerClassDeserializeSequenceMethod extends Method, UnsafeDe
   }
 }
 
+/**
+ * DEPRECATED: Use `FsPicklerSerializerClassDeserializeSiftedMethod` instead.
+ */
+deprecated class FsPicklerSerializerClasDeserializeSiftedMethod =
+  FsPicklerSerializerClassDeserializeSiftedMethod;
+
 /** `MBrace.FsPickler.FsPicklerSerializer.DeserializeSifted` method */
-class FsPicklerSerializerClasDeserializeSiftedMethod extends Method, UnsafeDeserializer {
-  FsPicklerSerializerClasDeserializeSiftedMethod() {
+class FsPicklerSerializerClassDeserializeSiftedMethod extends Method, UnsafeDeserializer {
+  FsPicklerSerializerClassDeserializeSiftedMethod() {
     this.getDeclaringType().getBaseClass*() instanceof FsPicklerSerializerClass and
     this.hasUndecoratedName("DeserializeSifted")
   }
diff --git a/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll b/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll
index 73b82c14700a..8c3e0562d395 100644
--- a/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll	
+++ b/csharp/ql/src/Bad Practices/Magic Constants/MagicConstants.qll	
@@ -113,7 +113,7 @@ private predicate valueOccurrenceCount(string value, int n) {
   n > 20
 }
 
-private predicate occurenceCount(Literal lit, string value, int n) {
+private predicate occurrenceCount(Literal lit, string value, int n) {
   valueOccurrenceCount(value, n) and
   value = lit.getValue() and
   relevantLiteral(lit, value)
@@ -127,7 +127,7 @@ private predicate check(Literal lit, string value, int n, File f) {
   // Check that the literal is nontrivial
   not trivial(lit) and
   // Check that it is repeated a number of times
-  occurenceCount(lit, value, n) and
+  occurrenceCount(lit, value, n) and
   n > 20 and
   f = lit.getFile()
 }
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 2539f93099f9..e1109181fca3 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.4
+
+No user-facing changes.
+
 ## 1.3.3
 
 No user-facing changes.
diff --git a/csharp/ql/src/Language Abuse/UselessUpcast.ql b/csharp/ql/src/Language Abuse/UselessUpcast.ql
index 827d16038b21..a06dc60cc7ab 100644
--- a/csharp/ql/src/Language Abuse/UselessUpcast.ql	
+++ b/csharp/ql/src/Language Abuse/UselessUpcast.ql	
@@ -75,15 +75,16 @@ private class ConstructorCall extends Call {
 
 /** An explicit upcast. */
 class ExplicitUpcast extends ExplicitCast {
-  ValueOrRefType src;
   ValueOrRefType dest;
 
   ExplicitUpcast() {
-    src = this.getSourceType() and
-    dest = this.getTargetType() and
-    (src instanceof RefType or src instanceof Struct) and
-    src.isImplicitlyConvertibleTo(dest) and
-    src != dest // Handled by `cs/useless-cast-to-self`
+    exists(ValueOrRefType src |
+      src = this.getSourceType() and
+      dest = this.getTargetType() and
+      (src instanceof RefType or src instanceof Struct) and
+      src.isImplicitlyConvertibleTo(dest) and
+      src != dest // Handled by `cs/useless-cast-to-self`
+    )
   }
 
   pragma[nomagic]
diff --git a/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp b/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp
index 04f01720ce66..4af37eadfd76 100644
--- a/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp	
+++ b/csharp/ql/src/Security Features/CWE-090/LDAPInjection.qhelp	
@@ -12,7 +12,7 @@ is likely to be able to run malicious LDAP queries.</p>
 <p>If user input must be included in an LDAP query, it should be escaped to
 avoid a malicious user providing special characters that change the meaning
 of the query. If possible, use an existing library, such as the AntiXSS
-library.</p>
+library. One may also make their own encoder filter <code>`LdapEncode`</code> following RFC 4515 standards.</p>
 </recommendation>
 
 <example>
@@ -35,7 +35,6 @@ the query cannot be changed by a malicious user.</p>
 <references>
 <li>OWASP: <a href="https://cheatsheetseries.owasp.org/cheatsheets/LDAP_Injection_Prevention_Cheat_Sheet.html">LDAP Injection Prevention Cheat Sheet</a>.</li>
 <li>OWASP: <a href="https://www.owasp.org/index.php/Preventing_LDAP_Injection_in_Java">Preventing LDAP Injection in Java</a>.</li>
-<li>AntiXSS doc: <a href="http://www.nudoq.org/#!/Packages/AntiXSS/AntiXssLibrary/Encoder/M/LdapFilterEncode">LdapFilterEncode</a>.</li>
-<li>AntiXSS doc: <a href="http://www.nudoq.org/#!/Packages/AntiXSS/AntiXssLibrary/Encoder/M/LdapDistinguishedNameEncode">LdapDistinguishedNameEncode</a>.</li>
+<li>RFC 4515: <a href="https://datatracker.ietf.org/doc/html/rfc4515#section-3">String Search Filter Definition</a>.</li>
 </references>
 </qhelp>
diff --git a/csharp/ql/src/Telemetry/DatabaseQuality.qll b/csharp/ql/src/Telemetry/DatabaseQuality.qll
index fa6c70dbc51f..ca2ab3e7e165 100644
--- a/csharp/ql/src/Telemetry/DatabaseQuality.qll
+++ b/csharp/ql/src/Telemetry/DatabaseQuality.qll
@@ -12,7 +12,7 @@ module CallTargetStats implements StatsSig {
   private predicate isNoSetterPropertyCallInConstructor(PropertyCall c) {
     exists(Property p, Constructor ctor |
       p = c.getProperty() and
-      not exists(Setter a | a = p.getAnAccessor()) and
+      not p.getAnAccessor() instanceof Setter and
       c.getEnclosingCallable() = ctor and
       (
         c.hasThisQualifier()
@@ -25,7 +25,7 @@ module CallTargetStats implements StatsSig {
   private predicate isNoSetterPropertyInitialization(PropertyCall c) {
     exists(Property p, AssignExpr assign |
       p = c.getProperty() and
-      not exists(Setter a | a = p.getAnAccessor()) and
+      not p.getAnAccessor() instanceof Setter and
       assign = c.getParent() and
       assign.getLValue() = c and
       assign.getParent() instanceof Property
diff --git a/csharp/ql/src/change-notes/released/1.3.4.md b/csharp/ql/src/change-notes/released/1.3.4.md
new file mode 100644
index 000000000000..5073aca7222c
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.3.4.md
@@ -0,0 +1,3 @@
+## 1.3.4
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index eb1f7dabc842..8263ddf2c8b8 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.3
+lastReleaseVersion: 1.3.4
diff --git a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql
index f18798c8b086..f175723c0997 100644
--- a/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
+++ b/csharp/ql/src/experimental/Security Features/CWE-759/HashWithoutSalt.ql	
@@ -10,6 +10,7 @@
  */
 
 import csharp
+import semmle.code.csharp.frameworks.system.Collections
 import HashWithoutSalt::PathGraph
 
 /** The C# class `Windows.Security.Cryptography.Core.HashAlgorithmProvider`. */
@@ -93,12 +94,17 @@ predicate hasAnotherHashCall(MethodCall mc) {
 
 /** Holds if a password hash without salt is further processed in another method call. */
 predicate hasFurtherProcessing(MethodCall mc) {
-  mc.getTarget().fromLibrary() and
-  (
-    mc.getTarget().hasFullyQualifiedName("System", "Array", "Copy") or // Array.Copy(passwordHash, 0, password.Length), 0, key, 0, keyLen);
-    mc.getTarget().hasFullyQualifiedName("System", "String", "Concat") or // string.Concat(passwordHash, saltkey)
-    mc.getTarget().hasFullyQualifiedName("System", "Buffer", "BlockCopy") or // Buffer.BlockCopy(passwordHash, 0, allBytes, 0, 20)
-    mc.getTarget().hasFullyQualifiedName("System", "String", "Format") // String.Format("{0}:{1}:{2}", username, salt, password)
+  exists(Method m | m = mc.getTarget() and m.fromLibrary() |
+    m.hasFullyQualifiedName("System", "Array", "Copy") // Array.Copy(passwordHash, 0, password.Length), 0, key, 0, keyLen);
+    or
+    m.hasFullyQualifiedName("System", "String", "Concat") // string.Concat(passwordHash, saltkey)
+    or
+    m.hasFullyQualifiedName("System", "Buffer", "BlockCopy") // Buffer.BlockCopy(passwordHash, 0, allBytes, 0, 20)
+    or
+    m.hasFullyQualifiedName("System", "String", "Format") // String.Format("{0}:{1}:{2}", username, salt, password)
+    or
+    m.getName() = "CopyTo" and
+    m.getDeclaringType().getABaseType*() instanceof SystemCollectionsICollectionInterface // passBytes.CopyTo(rawSalted, 0);
   )
 }
 
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index 959446de1d76..4acd0357d7e6 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.3.3
+version: 1.3.4
 groups:
   - csharp
   - queries
diff --git a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
index 9470b4536dc2..109be4aa9957 100644
--- a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.cs
@@ -233,3 +233,33 @@ public interface InterfaceB
 {
     void Foo(A2 a, object o, bool cond);
 }
+
+public class A3
+{
+    public virtual void M1(object o)
+    {
+        this.M2(o);
+    }
+
+    public virtual void M2(object o)
+    {
+        Sink(o); // should not have flow
+    }
+
+    public static void Sink(object o)
+    {
+    }
+}
+
+public class A4 : A3
+{
+    public override void M2(object o)
+    {
+        Sink(o); // should have flow
+    }
+
+    private void CallM1()
+    {
+        base.M1(new object());
+    }
+}
diff --git a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
index dfe1a951b277..955202f6afd3 100644
--- a/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/call-sensitivity/CallSensitivityFlow.expected
@@ -59,6 +59,10 @@ edges
 | CallSensitivityFlow.cs:187:13:187:13 | access to local variable o : Object | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | provenance |  |
 | CallSensitivityFlow.cs:187:17:187:30 | call to method CallMOut : Object | CallSensitivityFlow.cs:187:13:187:13 | access to local variable o : Object | provenance |  |
 | CallSensitivityFlow.cs:205:40:205:40 | o : Object | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | provenance |  |
+| CallSensitivityFlow.cs:239:35:239:35 | o : Object | CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | provenance |  |
+| CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | CallSensitivityFlow.cs:256:36:256:36 | o : Object | provenance |  |
+| CallSensitivityFlow.cs:256:36:256:36 | o : Object | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | provenance |  |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:239:35:239:35 | o : Object | provenance |  |
 nodes
 | CallSensitivityFlow.cs:7:38:7:38 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | semmle.label | access to parameter o : Object |
@@ -132,6 +136,11 @@ nodes
 | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | semmle.label | access to local variable o |
 | CallSensitivityFlow.cs:205:40:205:40 | o : Object | semmle.label | o : Object |
 | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | semmle.label | access to parameter o |
+| CallSensitivityFlow.cs:239:35:239:35 | o : Object | semmle.label | o : Object |
+| CallSensitivityFlow.cs:241:17:241:17 | access to parameter o : Object | semmle.label | access to parameter o : Object |
+| CallSensitivityFlow.cs:256:36:256:36 | o : Object | semmle.label | o : Object |
+| CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | semmle.label | access to parameter o |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | semmle.label | object creation of type Object : Object |
 subpaths
 | CallSensitivityFlow.cs:85:26:85:37 | object creation of type Object : Object | CallSensitivityFlow.cs:7:38:7:38 | o : Object | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | CallSensitivityFlow.cs:85:14:85:44 | call to method FlowThrough |
 | CallSensitivityFlow.cs:105:26:105:37 | object creation of type Object : Object | CallSensitivityFlow.cs:7:38:7:38 | o : Object | CallSensitivityFlow.cs:11:20:11:20 | access to parameter o : Object | CallSensitivityFlow.cs:105:14:105:41 | call to method FlowThrough |
@@ -156,3 +165,4 @@ subpaths
 | CallSensitivityFlow.cs:172:37:172:48 | object creation of type Object : Object | CallSensitivityFlow.cs:172:37:172:48 | object creation of type Object : Object | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | $@ | CallSensitivityFlow.cs:188:14:188:14 | access to local variable o | access to local variable o |
 | CallSensitivityFlow.cs:182:21:182:32 | object creation of type Object : Object | CallSensitivityFlow.cs:182:21:182:32 | object creation of type Object : Object | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | $@ | CallSensitivityFlow.cs:208:18:208:18 | access to parameter o | access to parameter o |
 | CallSensitivityFlow.cs:185:21:185:32 | object creation of type Object : Object | CallSensitivityFlow.cs:185:21:185:32 | object creation of type Object : Object | CallSensitivityFlow.cs:164:14:164:14 | access to parameter o | $@ | CallSensitivityFlow.cs:164:14:164:14 | access to parameter o | access to parameter o |
+| CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:263:17:263:28 | object creation of type Object : Object | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | $@ | CallSensitivityFlow.cs:258:14:258:14 | access to parameter o | access to parameter o |
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
index 705efd35e38a..d7552376c0f0 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.cs
@@ -116,7 +116,7 @@ void M17()
         {
             var a = new object[] { new object() };
             var b = Reverse(a);
-            Sink(b); // No flow
+            Sink(b); // Flow
             Sink(b[0]); // Flow
         }
 
diff --git a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
index 7254208be186..3099a3fec7e6 100644
--- a/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
+++ b/csharp/ql/test/library-tests/dataflow/external-models/ExternalFlow.expected
@@ -104,6 +104,7 @@ edges
 | ExternalFlow.cs:117:17:117:17 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | provenance |  |
 | ExternalFlow.cs:117:34:117:49 | { ..., ... } : null [element] : Object | ExternalFlow.cs:117:17:117:17 | access to local variable a : null [element] : Object | provenance |  |
 | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:117:34:117:49 | { ..., ... } : null [element] : Object | provenance |  |
+| ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | ExternalFlow.cs:119:18:119:18 | access to local variable b | provenance |  |
 | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | provenance |  |
 | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | provenance | MaD:7 |
@@ -240,6 +241,7 @@ nodes
 | ExternalFlow.cs:118:17:118:17 | access to local variable b : null [element] : Object | semmle.label | access to local variable b : null [element] : Object |
 | ExternalFlow.cs:118:21:118:30 | call to method Reverse : null [element] : Object | semmle.label | call to method Reverse : null [element] : Object |
 | ExternalFlow.cs:118:29:118:29 | access to local variable a : null [element] : Object | semmle.label | access to local variable a : null [element] : Object |
+| ExternalFlow.cs:119:18:119:18 | access to local variable b | semmle.label | access to local variable b |
 | ExternalFlow.cs:120:18:120:18 | access to local variable b : null [element] : Object | semmle.label | access to local variable b : null [element] : Object |
 | ExternalFlow.cs:120:18:120:21 | access to array element | semmle.label | access to array element |
 | ExternalFlow.cs:205:17:205:18 | access to local variable o2 : Object | semmle.label | access to local variable o2 : Object |
@@ -315,6 +317,7 @@ invalidModelRow
 | ExternalFlow.cs:102:22:102:22 | access to parameter d | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | ExternalFlow.cs:102:22:102:22 | access to parameter d | $@ | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:104:18:104:25 | access to field Field | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | ExternalFlow.cs:104:18:104:25 | access to field Field | $@ | ExternalFlow.cs:98:24:98:35 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:112:18:112:25 | access to property MyProp | ExternalFlow.cs:111:24:111:35 | object creation of type Object : Object | ExternalFlow.cs:112:18:112:25 | access to property MyProp | $@ | ExternalFlow.cs:111:24:111:35 | object creation of type Object : Object | object creation of type Object : Object |
+| ExternalFlow.cs:119:18:119:18 | access to local variable b | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:119:18:119:18 | access to local variable b | $@ | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:120:18:120:21 | access to array element | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | ExternalFlow.cs:120:18:120:21 | access to array element | $@ | ExternalFlow.cs:117:36:117:47 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | ExternalFlow.cs:205:22:205:33 | object creation of type Object : Object | ExternalFlow.cs:206:18:206:48 | call to method MixedFlowArgs | $@ | ExternalFlow.cs:205:22:205:33 | object creation of type Object : Object | object creation of type Object : Object |
 | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | ExternalFlow.cs:211:22:211:33 | object creation of type Object : Object | ExternalFlow.cs:212:18:212:62 | call to method GeneratedFlowWithGeneratedNeutral | $@ | ExternalFlow.cs:211:22:211:33 | object creation of type Object : Object | object creation of type Object : Object |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
index ff615d531152..36e23003fcc2 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummaries.expected
@@ -1683,9 +1683,9 @@ summary
 | Microsoft.AspNetCore.WebSockets;WebSocketMiddleware;WebSocketMiddleware;(Microsoft.AspNetCore.Http.RequestDelegate,Microsoft.Extensions.Options.IOptions<Microsoft.AspNetCore.Builder.WebSocketOptions>,Microsoft.Extensions.Logging.ILoggerFactory);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebSockets;WebSocketsDependencyInjectionExtensions;AddWebSockets;(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action<Microsoft.AspNetCore.Builder.WebSocketOptions>);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;BufferedReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;BufferedReadStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1696,10 +1696,10 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;FileBufferingReadStream;(System.IO.Stream,System.Int32,System.Nullable<System.Int64>,System.Func<System.String>,System.Buffers.ArrayPool<System.Byte>);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingReadStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1709,9 +1709,9 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FileBufferingWriteStream;(System.Int32,System.Nullable<System.Int64>,System.Func<System.String>);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -1719,10 +1719,10 @@ summary
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;FileBufferingWriteStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;();Argument[this];ReturnValue;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | Microsoft.AspNetCore.WebUtilities;HttpRequestStreamReader;ReadToEndAsync;();Argument[this];ReturnValue;taint;manual |
@@ -5278,8 +5278,8 @@ summary
 | ServiceStack.Text;NetCoreMemory;Deserialize;(System.IO.Stream,System.Type,ServiceStack.Text.Common.DeserializeStringSpanDelegate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;NetCoreMemory;DeserializeAsync;(System.IO.Stream,System.Type,ServiceStack.Text.Common.DeserializeStringSpanDelegate);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | ServiceStack.Text;RecyclableMemoryStream;GetBuffer;();Argument[this];ReturnValue;taint;df-generated |
-| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| ServiceStack.Text;RecyclableMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | ServiceStack.Text;RecyclableMemoryStream;TryGetBuffer;(System.ArraySegment<System.Byte>);Argument[this];Argument[0].Element;taint;df-generated |
 | ServiceStack.Text;RecyclableMemoryStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | ServiceStack.Text;RecyclableMemoryStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -10659,7 +10659,7 @@ summary
 | System.Data.SqlTypes;SqlDecimal;op_UnaryNegation;(System.Data.SqlTypes.SqlDecimal);Argument[0];ReturnValue;value;dfc-generated |
 | System.Data.SqlTypes;SqlDouble;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Data.SqlTypes;SqlDouble;WriteXml;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
-| System.Data.SqlTypes;SqlFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
+| System.Data.SqlTypes;SqlFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Data.SqlTypes;SqlFileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Data.SqlTypes;SqlGuid;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.Data.SqlTypes;SqlGuid;ReadXml;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
@@ -11970,16 +11970,16 @@ summary
 | System.Globalization;TextInfo;ToUpper;(System.String);Argument[0];ReturnValue;value;dfc-generated |
 | System.Globalization;TextInfo;get_CultureName;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;BrotliStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;BrotliStream;BrotliStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];value;dfc-generated |
 | System.IO.Compression;BrotliStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;BrotliStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;BrotliStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;BrotliStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;BrotliStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;BrotliStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;BrotliStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -11989,7 +11989,7 @@ summary
 | System.IO.Compression;BrotliStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;BrotliStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.BrotliStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;DeflateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;DeflateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;DeflateStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12000,10 +12000,10 @@ summary
 | System.IO.Compression;DeflateStream;DeflateStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;DeflateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;DeflateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;DeflateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;DeflateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;DeflateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;DeflateStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;DeflateStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12013,7 +12013,7 @@ summary
 | System.IO.Compression;DeflateStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;DeflateStream;get_BaseStream;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;GZipStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;GZipStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12023,10 +12023,10 @@ summary
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionLevel,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.CompressionMode,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
 | System.IO.Compression;GZipStream;GZipStream;(System.IO.Stream,System.IO.Compression.ZLibCompressionOptions,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];value;dfc-generated |
-| System.IO.Compression;GZipStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;GZipStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;GZipStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;GZipStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;GZipStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;GZipStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12036,17 +12036,17 @@ summary
 | System.IO.Compression;GZipStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;GZipStream;get_BaseStream;();Argument[this].SyntheticField[System.IO.Compression.GZipStream._deflateStream].SyntheticField[System.IO.Compression.DeflateStream._stream];ReturnValue;value;dfc-generated |
 | System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;ZLibStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Compression;ZLibStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.Compression;ZLibStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.Compression;ZLibStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Compression;ZLibStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Compression;ZLibStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Compression;ZLibStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Compression;ZLibStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Compression;ZLibStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12090,16 +12090,16 @@ summary
 | System.IO.IsolatedStorage;IsolatedStorage;get_AssemblyIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorage;get_DomainIdentity;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.IsolatedStorage;IsolatedStorageFileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.IsolatedStorage;IsolatedStorageFileStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12150,15 +12150,15 @@ summary
 | System.IO.Pipes;NamedPipeServerStream;NamedPipeServerStream;(System.IO.Pipes.PipeDirection,System.Boolean,System.Boolean,Microsoft.Win32.SafeHandles.SafePipeHandle);Argument[3];Argument[this];taint;df-generated |
 | System.IO.Pipes;NamedPipeServerStream;RunAsClient;(System.IO.Pipes.PipeStreamImpersonationWorker);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Pipes;PipeStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO.Pipes;PipeStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO.Pipes;PipeStream;InitializeHandle;(Microsoft.Win32.SafeHandles.SafePipeHandle,System.Boolean,System.Boolean);Argument[0];Argument[this].SyntheticField[System.IO.Pipes.PipeStream._handle];value;dfc-generated |
-| System.IO.Pipes;PipeStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO.Pipes;PipeStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO.Pipes;PipeStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO.Pipes;PipeStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO.Pipes;PipeStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO.Pipes;PipeStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12180,7 +12180,7 @@ summary
 | System.IO;BinaryWriter;Write;(System.ReadOnlySpan<System.Byte>);Argument[0];Argument[this];taint;df-generated |
 | System.IO;BinaryWriter;get_BaseStream;();Argument[this].Field[System.IO.BinaryWriter.OutStream];ReturnValue;value;dfc-generated |
 | System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;BufferedStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;BufferedStream;BufferedStream;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
@@ -12189,10 +12189,10 @@ summary
 | System.IO;BufferedStream;CopyToAsync;(System.IO.Stream,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;BufferedStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;BufferedStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;BufferedStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;BufferedStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;BufferedStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;BufferedStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;BufferedStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12302,7 +12302,7 @@ summary
 | System.IO;FileNotFoundException;GetObjectData;(System.Runtime.Serialization.SerializationInfo,System.Runtime.Serialization.StreamingContext);Argument[this];Argument[0];taint;df-generated |
 | System.IO;FileNotFoundException;get_Message;();Argument[this].SyntheticField[System.Exception._message];ReturnValue;value;dfc-generated |
 | System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;FileStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;FileStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12320,10 +12320,10 @@ summary
 | System.IO;FileStream;FileStream;(System.String,System.IO.FileStreamOptions);Argument[this];Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];value;dfc-generated |
 | System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this].SyntheticField[System.IO.FileStream._strategy].SyntheticField[System.IO.Strategies.DerivedFileStreamStrategy._fileStream];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;FileStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;FileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;FileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;FileStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;FileStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;FileStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;FileStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -12364,7 +12364,7 @@ summary
 | System.IO;FileSystemWatcher;remove_Error;(System.IO.ErrorEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;FileSystemWatcher;remove_Renamed;(System.IO.RenamedEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;MemoryStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;MemoryStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;MemoryStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -12376,10 +12376,10 @@ summary
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32,System.Boolean);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;MemoryStream;MemoryStream;(System.Byte[],System.Int32,System.Int32,System.Boolean,System.Boolean);Argument[0].Element;Argument[this];taint;manual |
-| System.IO;MemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;MemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;MemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;MemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;MemoryStream;ToArray;();Argument[this];ReturnValue;taint;manual |
 | System.IO;MemoryStream;TryGetBuffer;(System.ArraySegment<System.Byte>);Argument[this];Argument[0].Element;taint;df-generated |
 | System.IO;MemoryStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
@@ -12463,7 +12463,7 @@ summary
 | System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;CopyTo;(System.IO.Stream);Argument[this];Argument[0];taint;manual |
@@ -12475,15 +12475,15 @@ summary
 | System.IO;Stream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
-| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -12494,14 +12494,14 @@ summary
 | System.IO;Stream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[1];ReturnValue;taint;df-generated |
 | System.IO;Stream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StreamReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;StreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StreamReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;StreamReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StreamReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;StreamReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StreamReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StreamReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12577,13 +12577,13 @@ summary
 | System.IO;StreamWriter;get_BaseStream;();Argument[this].SyntheticField[System.IO.StreamWriter._stream];ReturnValue;value;dfc-generated |
 | System.IO;StreamWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;StringReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;StringReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;StringReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;StringReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;StringReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;StringReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;StringReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12615,14 +12615,14 @@ summary
 | System.IO;StringWriter;WriteLineAsync;(System.Text.StringBuilder,System.Threading.CancellationToken);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;TextReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -12707,10 +12707,10 @@ summary
 | System.IO;UnmanagedMemoryStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;Initialize;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
-| System.IO;UnmanagedMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;UnmanagedMemoryStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;UnmanagedMemoryStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Byte*,System.Int64,System.Int64,System.IO.FileAccess);Argument[0];Argument[this];taint;df-generated |
 | System.IO;UnmanagedMemoryStream;UnmanagedMemoryStream;(System.Runtime.InteropServices.SafeBuffer,System.Int64,System.Int64);Argument[0];Argument[this];taint;df-generated |
@@ -15118,15 +15118,15 @@ summary
 | System.Net.Quic;QuicListener;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicListenerOptions;set_ConnectionOptionsCallback;(System.Func<System.Net.Quic.QuicConnection,System.Net.Security.SslClientHelloInfo,System.Threading.CancellationToken,System.Threading.Tasks.ValueTask<System.Net.Quic.QuicServerConnectionOptions>>);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Quic;QuicStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Quic;QuicStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Quic;QuicStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Quic;QuicStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Quic;QuicStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Quic;QuicStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Quic;QuicStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Quic;QuicStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Quic;QuicStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -15159,14 +15159,14 @@ summary
 | System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Net.NetworkCredential,System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.Net.Security.ProtectionLevel,System.Security.Principal.TokenImpersonationLevel,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateStream;BeginAuthenticateAsServer;(System.Security.Authentication.ExtendedProtection.ExtendedProtectionPolicy,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;NegotiateStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;NegotiateStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;NegotiateStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Security;NegotiateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;NegotiateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;NegotiateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;NegotiateStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;NegotiateStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;NegotiateStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;NegotiateStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;NegotiateStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -15212,14 +15212,14 @@ summary
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Boolean,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginAuthenticateAsServer;(System.Security.Cryptography.X509Certificates.X509Certificate,System.Boolean,System.Security.Authentication.SslProtocols,System.Boolean,System.AsyncCallback,System.Object);Argument[4];Argument[4].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;SslStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Security;SslStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Security;SslStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Net.Security;SslStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Net.Security;SslStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;SslStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Security;SslStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Security;SslStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;SslStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Security;SslStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Net.Security;SslStream;SslStream;(System.IO.Stream,System.Boolean,System.Net.Security.RemoteCertificateValidationCallback,System.Net.Security.LocalCertificateSelectionCallback);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
@@ -15247,15 +15247,15 @@ summary
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[0];Argument[this];taint;df-generated |
 | System.Net.Sockets;MulticastOption;MulticastOption;(System.Net.IPAddress,System.Net.IPAddress);Argument[1];Argument[this];taint;df-generated |
 | System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Sockets;NetworkStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Net.Sockets;NetworkStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
 | System.Net.Sockets;NetworkStream;NetworkStream;(System.Net.Sockets.Socket,System.IO.FileAccess,System.Boolean);Argument[0];Argument[this].SyntheticField[System.Net.Sockets.NetworkStream._streamSocket];value;dfc-generated |
-| System.Net.Sockets;NetworkStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Net.Sockets;NetworkStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Net.Sockets;NetworkStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Net.Sockets;NetworkStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Net.Sockets;NetworkStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
 | System.Net.Sockets;NetworkStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
@@ -17765,7 +17765,7 @@ summary
 | System.Security.Cryptography;CngUIPolicy;CngUIPolicy;(System.Security.Cryptography.CngUIProtectionLevels,System.String,System.String,System.String,System.String);Argument[3];Argument[this].Property[System.Security.Cryptography.CngUIPolicy.UseContext];value;dfc-generated |
 | System.Security.Cryptography;CngUIPolicy;CngUIPolicy;(System.Security.Cryptography.CngUIProtectionLevels,System.String,System.String,System.String,System.String);Argument[4];Argument[this].Property[System.Security.Cryptography.CngUIPolicy.CreationTitle];value;dfc-generated |
 | System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.Security.Cryptography;CryptoStream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.Security.Cryptography;CryptoStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.Security.Cryptography;CryptoStream;CopyTo;(System.IO.Stream,System.Int32);Argument[this];Argument[0];taint;manual |
@@ -17774,9 +17774,9 @@ summary
 | System.Security.Cryptography;CryptoStream;CryptoStream;(System.IO.Stream,System.Security.Cryptography.ICryptoTransform,System.Security.Cryptography.CryptoStreamMode,System.Boolean);Argument[1];Argument[this];taint;df-generated |
 | System.Security.Cryptography;CryptoStream;DisposeAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.Security.Cryptography;CryptoStream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.Security.Cryptography;CryptoStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.Security.Cryptography;CryptoStream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.Security.Cryptography;CryptoStream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.Security.Cryptography;CryptoStream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[0].Element;Argument[this];taint;manual |
 | System.Security.Cryptography;CryptoStream;WriteAsync;(System.ReadOnlyMemory<System.Byte>,System.Threading.CancellationToken);Argument[0];Argument[this];taint;df-generated |
@@ -20882,24 +20882,33 @@ summary
 | System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;(System.Int32);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlDictionaryReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryString;ToString;();Argument[this].SyntheticField[System.Xml.XmlDictionaryString._value];ReturnValue;value;dfc-generated |
@@ -21261,30 +21270,28 @@ summary
 | System.Xml;XmlNodeList;GetEnumerator;();Argument[this].Element;ReturnValue.Property[System.Collections.IEnumerator.Current];value;manual |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeList;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlNodeReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlNodeReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlNodeReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlNodeReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlNodeReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
-| System.Xml;XmlNodeReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlNodeReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlNodeReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
+| System.Xml;XmlNodeReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlNodeReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;WriteContentTo;(System.Xml.XmlWriter);Argument[this];Argument[0];taint;df-generated |
@@ -21337,60 +21344,58 @@ summary
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.Xml.XmlReader,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
-| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsObjectAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadOuterXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadValueChunk;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadValueChunkAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReaderSettings;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlReaderSettings;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -21430,43 +21435,44 @@ summary
 | System.Xml;XmlText;get_ParentNode;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlText;get_PreviousText;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlText;get_Value;();Argument[this];ReturnValue;taint;manual |
-| System.Xml;XmlTextReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlTextReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlTextReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlTextReader;ReadBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlTextReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlTextReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlTextReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlTextReader;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
@@ -21541,37 +21547,35 @@ summary
 | System.Xml;XmlUrlResolver;ResolveUri;(System.Uri,System.String);Argument[1];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Credentials;(System.Net.ICredentials);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlValidatingReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlValidatingReader;LookupPrefix;(System.String);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;dfc-generated |
+| System.Xml;XmlValidatingReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlValidatingReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.Xml.XmlReader);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlValidatingReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlValidatingReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_Reader;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;get_SchemaType;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;get_Schemas;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlValidatingReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlValidatingReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlWhitespace;CloneNode;(System.Boolean);Argument[this];ReturnValue;taint;df-generated |
@@ -21887,15 +21891,15 @@ summary
 | System;Convert;ChangeType;(System.Object,System.Type,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
-| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue.Element;taint;manual |
+| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Convert;GetTypeCode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System;Convert;IsDBNull;(System.Object);Argument[0];ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[],System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
@@ -22201,13 +22205,13 @@ summary
 | System;Convert;ToUInt64;(System.UInt16);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt32);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt64);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[2];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Converter<TInput,TOutput>;BeginInvoke;(TInput,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
index faf716f4d7be..25ac85e95485 100644
--- a/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
+++ b/csharp/ql/test/library-tests/dataflow/library/FlowSummariesFiltered.expected
@@ -9285,7 +9285,7 @@
 | System.IO;RenamedEventArgs;get_OldName;();Argument[this].SyntheticField[System.IO.RenamedEventArgs._oldName];ReturnValue;value;dfc-generated |
 | System.IO;RenamedEventHandler;BeginInvoke;(System.Object,System.IO.RenamedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
-| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;BeginRead;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;BeginWrite;(System.Byte[],System.Int32,System.Int32,System.AsyncCallback,System.Object);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
 | System.IO;Stream;CopyTo;(System.IO.Stream);Argument[this];Argument[0];taint;manual |
@@ -9296,15 +9296,15 @@
 | System.IO;Stream;CopyToAsync;(System.IO.Stream,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;FlushAsync;();Argument[this];ReturnValue;taint;df-generated |
 | System.IO;Stream;FlushAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue.SyntheticField[System.Threading.Tasks.Task.m_stateObject];value;dfc-generated |
-| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;Read;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;Read;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Byte[],System.Int32,System.Int32,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAsync;(System.Memory<System.Byte>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadAtLeast;(System.Span<System.Byte>,System.Int32,System.Boolean);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;ReadAtLeastAsync;(System.Memory<System.Byte>,System.Int32,System.Boolean,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
-| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;Stream;ReadExactly;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;Stream;ReadExactly;(System.Span<System.Byte>);Argument[this];Argument[0];taint;manual |
 | System.IO;Stream;Synchronized;(System.IO.Stream);Argument[0];ReturnValue;value;dfc-generated |
 | System.IO;Stream;Write;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;manual |
 | System.IO;Stream;Write;(System.ReadOnlySpan<System.Byte>);Argument[0].Element;Argument[this];taint;manual |
@@ -9336,14 +9336,14 @@
 | System.IO;StringWriter;StringWriter;(System.Text.StringBuilder,System.IFormatProvider);Argument[0];Argument[this];taint;manual |
 | System.IO;StringWriter;ToString;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;Read;();Argument[this];ReturnValue;taint;manual |
-| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0].Element;taint;manual |
-| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0].Element;taint;manual |
+| System.IO;TextReader;Read;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;Read;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlock;(System.Span<System.Char>);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.IO;TextReader;ReadBlockAsync;(System.Memory<System.Char>,System.Threading.CancellationToken);Argument[this];Argument[0];taint;manual |
 | System.IO;TextReader;ReadLine;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;();Argument[this];ReturnValue;taint;manual |
 | System.IO;TextReader;ReadLineAsync;(System.Threading.CancellationToken);Argument[this];ReturnValue;taint;df-generated |
@@ -16210,17 +16210,28 @@
 | System.Xml;XmlDictionaryReader;CreateDictionaryReader;(System.Xml.XmlReader);Argument[0];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[7];Argument[7].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlDictionaryReader;CreateMtomReader;(System.IO.Stream,System.Text.Encoding[],System.String,System.Xml.XmlDictionaryReaderQuotas,System.Int32,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;hq-generated |
-| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;hq-generated |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[5];Argument[5].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Int32,System.Int32,System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.Byte[],System.Xml.XmlDictionaryReaderQuotas);Argument[0].Element;ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[0];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Text.Encoding,System.Xml.XmlDictionaryReaderQuotas,System.Xml.OnXmlDictionaryReaderClose);Argument[3];Argument[3].Parameter[delegate-self];value;manual |
+| System.Xml;XmlDictionaryReader;CreateTextReader;(System.IO.Stream,System.Xml.XmlDictionaryReaderQuotas);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;GetAttribute;(System.Xml.XmlDictionaryString,System.Xml.XmlDictionaryString);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;GetNonAtomizedNames;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsBinHex;(System.Int32);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadContentAsChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[0];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsQualifiedName;(System.String,System.String);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.String[],System.Int32);Argument[0].Element;ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsString;(System.Xml.XmlDictionaryString[],System.Int32);Argument[0].Element.Property[System.Xml.XmlDictionaryString.Value];ReturnValue;value;dfc-generated |
 | System.Xml;XmlDictionaryReader;ReadContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBase64;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlDictionaryReader;ReadElementContentAsBinHex;();Argument[this];ReturnValue;taint;manual |
 | System.Xml;XmlDictionaryReader;ReadElementContentAsUniqueId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;ReadString;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlDictionaryReader;get_Quotas;();Argument[this];ReturnValue;taint;df-generated |
@@ -16503,8 +16514,6 @@
 | System.Xml;XmlNodeChangedEventHandler;BeginInvoke;(System.Object,System.Xml.XmlNodeChangedEventArgs,System.AsyncCallback,System.Object);Argument[2];Argument[2].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlNodeList;Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNodeList;get_ItemOf;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlNodeReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlNodeReader;XmlNodeReader;(System.Xml.XmlNode);Argument[0].Element;Argument[this];taint;df-generated |
 | System.Xml;XmlNotation;get_PublicId;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlNotation;get_SystemId;();Argument[this];ReturnValue;taint;df-generated |
@@ -16539,60 +16548,58 @@
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.String,System.Xml.XmlReaderSettings,System.Xml.XmlParserContext);Argument[0];ReturnValue;taint;manual |
 | System.Xml;XmlReader;Create;(System.Xml.XmlReader,System.Xml.XmlReaderSettings);Argument[0];ReturnValue;taint;manual |
-| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;GetAttribute;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetAttribute;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;GetValueAsync;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;LookupNamespace;(System.String);Argument[0];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;MoveToAttribute;(System.String);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;ReadContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsObjectAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadContentAsStringAsync;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];Argument[1];taint;df-generated |
 | System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];Argument[1];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[1];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[0].Element;Argument[this];taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-generated |
+| System.Xml;XmlReader;ReadElementContentAs;(System.Type,System.Xml.IXmlNamespaceResolver,System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsAsync;(System.Type,System.Xml.IXmlNamespaceResolver);Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBase64Async;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsBinHexAsync;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsObject;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementContentAsString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadElementString;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadInnerXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadOuterXml;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadOuterXmlAsync;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlReader;ReadString;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadSubtree;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;ReadValueChunk;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;ReadValueChunkAsync;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlReader;get_BaseURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.Int32);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Item;(System.String,System.String);Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_LocalName;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Name;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NameTable;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_NamespaceURI;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_Prefix;();Argument[this];ReturnValue;taint;df-manual |
+| System.Xml;XmlReader;get_SchemaInfo;();Argument[this];ReturnValue;value;dfc-manual |
 | System.Xml;XmlReader;get_Settings;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-generated |
+| System.Xml;XmlReader;get_Value;();Argument[this];ReturnValue;taint;df-manual |
 | System.Xml;XmlReader;get_XmlLang;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlReaderSettings;add_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
 | System.Xml;XmlReaderSettings;remove_ValidationEventHandler;(System.Xml.Schema.ValidationEventHandler);Argument[0];Argument[0].Parameter[delegate-self];value;hq-generated |
@@ -16608,21 +16615,25 @@
 | System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;df-generated |
 | System.Xml;XmlSecureResolver;GetEntityAsync;(System.Uri,System.String,System.Type);Argument[0];ReturnValue.Property[System.Threading.Tasks.Task`1.Result];taint;dfc-generated |
 | System.Xml;XmlText;SplitText;(System.Int32);Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];value;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];taint;dfc-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
-| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];value;dfc-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_BaseURI;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._reportedBaseUri];ReturnValue;value;dfc-generated |
+| System.Xml;XmlTextReader;GetNamespacesInScope;(System.Xml.XmlNamespaceScope);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;GetRemainder;();Argument[this];ReturnValue;taint;manual |
+| System.Xml;XmlTextReader;ReadBase64;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadBinHex;(System.Byte[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;ReadChars;(System.Char[],System.Int32,System.Int32);Argument[this];Argument[0];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.Stream,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.IO.TextReader,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[0];Argument[this];taint;manual |
+| System.Xml;XmlTextReader;XmlTextReader;(System.Xml.XmlNameTable);Argument[0];Argument[this];taint;manual |
 | System.Xml;XmlTextReader;get_Encoding;();Argument[this];ReturnValue;taint;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;df-generated |
-| System.Xml;XmlTextReader;get_NameTable;();Argument[this].SyntheticField[System.Xml.XmlTextReader._impl].SyntheticField[System.Xml.XmlTextReaderImpl._nameTable];ReturnValue;value;dfc-generated |
 | System.Xml;XmlTextReader;set_XmlResolver;(System.Xml.XmlResolver);Argument[0];Argument[this];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;df-generated |
 | System.Xml;XmlTextWriter;WriteDocType;(System.String,System.String,System.String,System.String);Argument[0];Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter];taint;dfc-generated |
@@ -16653,8 +16664,6 @@
 | System.Xml;XmlTextWriter;get_BaseStream;();Argument[this].SyntheticField[System.Xml.XmlTextWriter._textWriter].Property[System.IO.StreamWriter.BaseStream];ReturnValue;value;dfc-generated |
 | System.Xml;XmlUrlResolver;GetEntity;(System.Uri,System.String,System.Type);Argument[0].Property[System.Uri.LocalPath];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlUrlResolver;set_Proxy;(System.Net.IWebProxy);Argument[0];Argument[this];taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;df-generated |
-| System.Xml;XmlValidatingReader;ReadString;();Argument[this].Property[System.Xml.XmlReader.Value];ReturnValue;taint;dfc-generated |
 | System.Xml;XmlValidatingReader;ReadTypedValue;();Argument[this];ReturnValue;taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.IO.Stream,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
 | System.Xml;XmlValidatingReader;XmlValidatingReader;(System.String,System.Xml.XmlNodeType,System.Xml.XmlParserContext);Argument[2];Argument[this];taint;df-generated |
@@ -16908,15 +16917,15 @@
 | System;Convert;ChangeType;(System.Object,System.Type,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ChangeType;(System.Object,System.TypeCode,System.IFormatProvider);Argument[0];ReturnValue;taint;manual |
-| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue.Element;taint;manual |
-| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue.Element;taint;manual |
+| System;Convert;FromBase64CharArray;(System.Char[],System.Int32,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromBase64String;(System.String);Argument[0];ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.ReadOnlySpan<System.Char>);Argument[0].Element;ReturnValue;taint;manual |
+| System;Convert;FromHexString;(System.String);Argument[0];ReturnValue;taint;manual |
 | System;Convert;GetTypeCode;(System.Object);Argument[0];ReturnValue;taint;manual |
 | System;Convert;IsDBNull;(System.Object);Argument[0];ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3].Element;taint;manual |
+| System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[3];taint;manual |
 | System;Convert;ToBase64CharArray;(System.Byte[],System.Int32,System.Int32,System.Char[],System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[]);Argument[0].Element;ReturnValue;taint;manual |
 | System;Convert;ToBase64String;(System.Byte[],System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
@@ -17222,13 +17231,13 @@
 | System;Convert;ToUInt64;(System.UInt16);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt32);Argument[0];ReturnValue;taint;manual |
 | System;Convert;ToUInt64;(System.UInt64);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryFromBase64Chars;(System.ReadOnlySpan<System.Char>,System.Span<System.Byte>,System.Int32);Argument[0].Element;ReturnValue;taint;manual |
-| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1].Element;taint;manual |
+| System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[1];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];Argument[2];taint;manual |
 | System;Convert;TryFromBase64String;(System.String,System.Span<System.Byte>,System.Int32);Argument[0];ReturnValue;taint;manual |
-| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1].Element;taint;manual |
+| System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[1];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;Argument[2];taint;manual |
 | System;Convert;TryToBase64Chars;(System.ReadOnlySpan<System.Byte>,System.Span<System.Char>,System.Int32,System.Base64FormattingOptions);Argument[0].Element;ReturnValue;taint;manual |
 | System;Converter<TInput,TOutput>;BeginInvoke;(TInput,System.AsyncCallback,System.Object);Argument[1];Argument[1].Parameter[delegate-self];value;hq-generated |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
index a3850dd73ebd..124caa4e69e4 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest1.expected
@@ -1,30 +1,30 @@
 models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
 | 2 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 3 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 3 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 4 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:4 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:2  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:3 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:3 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:4 |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
index 9b1b32b57fda..d3ae7cc363d3 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest2.expected
@@ -2,36 +2,36 @@ models
 | 1 | Sink: System.Data.SqlClient; SqlCommand; false; SqlCommand; (System.String,System.Data.SqlClient.SqlConnection); ; Argument[0]; sql-injection; manual |
 | 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
 | 3 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 4 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 4 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 5 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:5 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:5 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:3  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:4 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:4 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:5 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:5 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
index ee8d0615b2d4..ea0ab7943d25 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest3.expected
@@ -4,18 +4,18 @@ models
 | 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 4 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 5 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 6 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 6 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 7 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:7 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:7 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:5  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:6 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:6 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:7 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:7 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
@@ -23,16 +23,16 @@ edges
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -43,7 +43,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
index cac7f178b409..9648aa5e5eb7 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest4.expected
@@ -5,18 +5,18 @@ models
 | 4 | Source: My.Qltest; TestSources; false; GetCustom; (System.String); ; ReturnValue; custom; manual |
 | 5 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 6 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 7 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 7 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 8 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:8 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:8 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:6  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:7 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:7 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:8 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:8 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
@@ -26,16 +26,16 @@ edges
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -49,7 +49,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
index b0e7142693f9..b13812650b84 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest5.expected
@@ -3,33 +3,33 @@ models
 | 2 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 3 | Source: My.Qltest; TestSources; false; ReadEnv; (System.String); ; ReturnValue; environment; manual |
 | 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:5 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
 | Test.cs:43:20:43:25 | access to local variable result : String | Test.cs:46:42:46:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:43:20:43:25 | access to local variable result : String | provenance | Src:MaD:3  |
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:2  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:43:20:43:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | semmle.label | call to method ReadEnv : String |
 | Test.cs:46:42:46:96 | ... + ... | semmle.label | ... + ... |
@@ -37,7 +37,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:43:29:43:50 | call to method ReadEnv : String | Test.cs:46:42:46:96 | ... + ... |
diff --git a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
index ae9fccfab806..ccaa28dde3e5 100644
--- a/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
+++ b/csharp/ql/test/library-tests/dataflow/threat-models/threat-models-flowtest6.expected
@@ -3,33 +3,33 @@ models
 | 2 | Source: My.Qltest; TestSources; false; ExecuteQuery; (System.String); ; ReturnValue; database; manual |
 | 3 | Source: My.Qltest; TestSources; false; GetCliArg; (System.Int32); ; ReturnValue; commandargs; manual |
 | 4 | Source: System.Net.Sockets; TcpClient; false; GetStream; ; ; ReturnValue; remote; manual |
-| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0].Element; taint; manual |
+| 5 | Summary: System.IO; Stream; true; Read; (System.Byte[],System.Int32,System.Int32); ; Argument[this]; Argument[0]; taint; manual |
 | 6 | Summary: System.Text; Encoding; true; GetString; (System.Byte[]); ; Argument[0].Element; ReturnValue; taint; manual |
 edges
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
+| Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | provenance |  |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | provenance | MaD:6 |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | provenance |  |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | provenance | Src:MaD:4  |
-| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | provenance | MaD:5 |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | provenance |  |
+| Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | provenance | MaD:5 |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | provenance |  |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | Test.cs:28:42:28:111 | ... + ... | provenance | Sink:MaD:1 |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | provenance |  |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | provenance |  |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:28:85:28:105 | call to method BytesToString : String | provenance | MaD:6 |
 | Test.cs:34:20:34:25 | access to local variable result : String | Test.cs:37:42:37:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:34:20:34:25 | access to local variable result : String | provenance | Src:MaD:2  |
 | Test.cs:62:20:62:25 | access to local variable result : String | Test.cs:65:42:65:96 | ... + ... | provenance | Sink:MaD:1 |
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | Test.cs:62:20:62:25 | access to local variable result : String | provenance | Src:MaD:3  |
 nodes
-| Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | semmle.label | bytes : Byte[] [element] : Object |
+| Test.cs:12:45:12:49 | bytes : Byte[] | semmle.label | bytes : Byte[] |
 | Test.cs:15:20:15:61 | call to method GetString : String | semmle.label | call to method GetString : String |
-| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] [element] : Object | semmle.label | access to parameter bytes : Byte[] [element] : Object |
+| Test.cs:15:56:15:60 | access to parameter bytes : Byte[] | semmle.label | access to parameter bytes : Byte[] |
 | Test.cs:23:33:23:38 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | semmle.label | call to method GetStream : NetworkStream |
 | Test.cs:25:29:25:34 | access to local variable stream : NetworkStream | semmle.label | access to local variable stream : NetworkStream |
-| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] [element] : Object | semmle.label | [post] access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:25:41:25:46 | [post] access to local variable buffer : Byte[] | semmle.label | [post] access to local variable buffer : Byte[] |
 | Test.cs:28:42:28:111 | ... + ... | semmle.label | ... + ... |
 | Test.cs:28:85:28:105 | call to method BytesToString : String | semmle.label | call to method BytesToString : String |
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | semmle.label | access to local variable buffer : Byte[] [element] : Object |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | semmle.label | access to local variable buffer : Byte[] |
 | Test.cs:34:20:34:25 | access to local variable result : String | semmle.label | access to local variable result : String |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | semmle.label | call to method ExecuteQuery : String |
 | Test.cs:37:42:37:96 | ... + ... | semmle.label | ... + ... |
@@ -37,7 +37,7 @@ nodes
 | Test.cs:62:29:62:48 | call to method GetCliArg : String | semmle.label | call to method GetCliArg : String |
 | Test.cs:65:42:65:96 | ... + ... | semmle.label | ... + ... |
 subpaths
-| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] [element] : Object | Test.cs:12:45:12:49 | bytes : Byte[] [element] : Object | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
+| Test.cs:28:99:28:104 | access to local variable buffer : Byte[] | Test.cs:12:45:12:49 | bytes : Byte[] | Test.cs:15:20:15:61 | call to method GetString : String | Test.cs:28:85:28:105 | call to method BytesToString : String |
 #select
 | Test.cs:23:42:23:59 | call to method GetStream : NetworkStream | Test.cs:28:42:28:111 | ... + ... |
 | Test.cs:34:29:34:69 | call to method ExecuteQuery : String | Test.cs:37:42:37:96 | ... + ... |
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
index 3b9a54fafb3d..476875a279e5 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.expected
@@ -1,6 +1,13 @@
+#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 | NameList2.cs:31:57:31:60 | 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. | NameList2.cs:31:57:31:60 | access to property Name : String | 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 |
 edges
-| NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:149 |
-| 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 |
+| NameList2.cs:31:57:31:60 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:1 |
+| NameList.cs:31:99:31:102 | access to property Name : String | Name.cs:13:53:13:59 | access to property TheName | provenance | Sink:MaD:1 |
+models
+| 1 | Sink: Microsoft.AspNetCore.Components; MarkupString; false; op_Explicit; (System.String); ; Argument[0]; html-injection; manual |
 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 |
@@ -8,8 +15,3 @@ nodes
 | NameList2.cs:31:57:31:60 | access to property Name : String | semmle.label | access to property Name : String |
 | 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 | NameList2.cs:31:57:31:60 | 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. | NameList2.cs:31:57:31:60 | access to property Name : String | 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
index faad1d6403c1..89b5b951bdb6 100644
--- a/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
+++ b/csharp/ql/test/library-tests/frameworks/microsoft/aspnetcore/blazor/Xss.qlref
@@ -1 +1,2 @@
-Security Features/CWE-079/XSS.ql
\ No newline at end of file
+query: Security Features/CWE-079/XSS.ql
+postprocess: utils/test/PrettyPrintModels.ql
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs
new file mode 100644
index 000000000000..d4177a576616
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.cs
@@ -0,0 +1,13 @@
+public class CollectionTaintTracking
+{
+    public void ImplicitCollectionReadAtSink()
+    {
+        var tainted = Source<object>(1);
+        var arr = new object[] { tainted };
+        Sink(arr); // $ hasTaintFlow=1
+    }
+
+    static T Source<T>(object source) => throw null;
+
+    public static void Sink<T>(T t) { }
+}
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected
new file mode 100644
index 000000000000..6d93e7f5ef9f
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.expected
@@ -0,0 +1,18 @@
+models
+edges
+| CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | provenance |  |
+| CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | provenance |  |
+| CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | provenance |  |
+| CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | provenance |  |
+| CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | provenance |  |
+nodes
+| CollectionTaintTracking.cs:5:13:5:19 | access to local variable tainted : Object | semmle.label | access to local variable tainted : Object |
+| CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | semmle.label | call to method Source<Object> : Object |
+| CollectionTaintTracking.cs:6:13:6:15 | access to local variable arr : null [element] : Object | semmle.label | access to local variable arr : null [element] : Object |
+| CollectionTaintTracking.cs:6:32:6:42 | { ..., ... } : null [element] : Object | semmle.label | { ..., ... } : null [element] : Object |
+| CollectionTaintTracking.cs:6:34:6:40 | access to local variable tainted : Object | semmle.label | access to local variable tainted : Object |
+| CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | semmle.label | access to local variable arr |
+subpaths
+testFailures
+#select
+| CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | CollectionTaintTracking.cs:7:14:7:16 | access to local variable arr | $@ | CollectionTaintTracking.cs:5:23:5:39 | call to method Source<Object> : Object | call to method Source<Object> : Object |
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql
new file mode 100644
index 000000000000..0af8971a13b2
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/CollectionTaintTracking.ql
@@ -0,0 +1,12 @@
+/**
+ * @kind path-problem
+ */
+
+import csharp
+import utils.test.InlineFlowTest
+import TaintFlowTest<DefaultFlowConfig>
+import PathGraph
+
+from PathNode source, PathNode sink
+where flowPath(source, sink)
+select sink, source, sink, "$@", source, source.toString()
diff --git a/csharp/ql/test/library-tests/tainttracking/collections/options b/csharp/ql/test/library-tests/tainttracking/collections/options
new file mode 100644
index 000000000000..75c39b4541ba
--- /dev/null
+++ b/csharp/ql/test/library-tests/tainttracking/collections/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/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected
index c3377fcb04f0..88d0baa49432 100644
--- a/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected	
+++ b/csharp/ql/test/query-tests/Security Features/CWE-502/UnsafeDeserializationUntrustedInput/UnsafeDeserializationUntrustedInput.expected	
@@ -11,9 +11,9 @@ edges
 | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | BinaryFormatterUntrustedInputBad.cs:13:31:13:84 | object creation of type MemoryStream | provenance | MaD:1 |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:77 | access to parameter textBox : TextBox | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | provenance | MaD:3 |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | provenance | MaD:2 |
-| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | provenance | MaD:1 |
+| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | provenance | MaD:1 |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:76 | access to parameter data : TextBox | BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | provenance | MaD:3 |
-| BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | provenance | MaD:4 |
+| BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | provenance | MaD:4 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:47:13:79 | call to method GetBytes : Byte[] | DataContractJsonSerializerUntrustedInputBad.cs:13:30:13:80 | object creation of type MemoryStream | provenance | MaD:1 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:73 | access to parameter data : TextBox | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:78 | access to property Text : String | provenance | MaD:3 |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:70:13:78 | access to property Text : String | DataContractJsonSerializerUntrustedInputBad.cs:13:47:13:79 | call to method GetBytes : Byte[] | provenance | MaD:2 |
@@ -34,14 +34,14 @@ models
 | 1 | Summary: System.IO; MemoryStream; false; MemoryStream; (System.Byte[]); ; Argument[0].Element; Argument[this]; taint; manual |
 | 2 | Summary: System.Text; Encoding; true; GetBytes; (System.String); ; Argument[0]; ReturnValue; taint; manual |
 | 3 | Summary: System.Web.UI.WebControls; TextBox; false; get_Text; (); ; Argument[this]; ReturnValue; taint; manual |
-| 4 | Summary: System; Convert; false; FromBase64String; (System.String); ; Argument[0]; ReturnValue.Element; taint; manual |
+| 4 | Summary: System; Convert; false; FromBase64String; (System.String); ; Argument[0]; ReturnValue; taint; manual |
 nodes
 | BinaryFormatterUntrustedInputBad.cs:13:31:13:84 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
 | BinaryFormatterUntrustedInputBad.cs:13:48:13:83 | call to method GetBytes : Byte[] | semmle.label | call to method GetBytes : Byte[] |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:77 | access to parameter textBox : TextBox | semmle.label | access to parameter textBox : TextBox |
 | BinaryFormatterUntrustedInputBad.cs:13:71:13:82 | access to property Text : String | semmle.label | access to property Text : String |
 | BinaryFormatterUntrustedInputBad.cs:23:31:23:83 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
-| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] [element] : Object | semmle.label | call to method FromBase64String : Byte[] [element] : Object |
+| BinaryFormatterUntrustedInputBad.cs:23:48:23:82 | call to method FromBase64String : Byte[] | semmle.label | call to method FromBase64String : Byte[] |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:76 | access to parameter data : TextBox | semmle.label | access to parameter data : TextBox |
 | BinaryFormatterUntrustedInputBad.cs:23:73:23:81 | access to property Text : String | semmle.label | access to property Text : String |
 | DataContractJsonSerializerUntrustedInputBad.cs:13:30:13:80 | object creation of type MemoryStream | semmle.label | object creation of type MemoryStream |
diff --git a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
index 94b291a69b83..3c2f44fcf15d 100644
--- a/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
+++ b/docs/codeql/codeql-for-visual-studio-code/setting-up-codeql-in-visual-studio-code.rst
@@ -74,7 +74,7 @@ To use the starter workspace:
     * Make sure you include the submodules, either by using ``git clone --recursive``, or using by ``git submodule update --init --remote`` after cloning.
     * Use ``git submodule update --remote`` regularly to keep the submodules up to date.
 
-#. In VS Code, use the **File** > **Open Workspace** option to open the ``vscode-codeql-starter.code-workspace`` file from your checkout of the workspace repository.
+#. In VS Code, use the **File** > **Open Workspace from File** option to open the ``vscode-codeql-starter.code-workspace`` file from your checkout of the workspace repository.
 
 Remember to update the ``ql`` submodule in the starter workspace periodically to ensure that it remains compatible with newer versions of the VS Code extension and the CodeQL CLI.
 
diff --git a/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst
new file mode 100644
index 000000000000..97dc83d41dab
--- /dev/null
+++ b/docs/codeql/codeql-overview/codeql-changelog/codeql-cli-2.22.4.rst
@@ -0,0 +1,108 @@
+.. _codeql-cli-2.22.4:
+
+==========================
+CodeQL 2.22.4 (2025-08-21)
+==========================
+
+.. contents:: Contents
+   :depth: 2
+   :local:
+   :backlinks: none
+
+This is an overview of changes in the CodeQL CLI and relevant CodeQL query and library packs. For additional updates on changes to the CodeQL code scanning experience, check out the `code scanning section on the GitHub blog <https://github.blog/tag/code-scanning/>`__, `relevant GitHub Changelog updates <https://github.blog/changelog/label/code-scanning/>`__, `changes in the CodeQL extension for Visual Studio Code <https://marketplace.visualstudio.com/items/GitHub.vscode-codeql/changelog>`__, and the `CodeQL Action changelog <https://github.com/github/codeql-action/blob/main/CHANGELOG.md>`__.
+
+Security Coverage
+-----------------
+
+CodeQL 2.22.4 runs a total of 478 security queries when configured with the Default suite (covering 169 CWE). The Extended suite enables an additional 130 queries (covering 32 more CWE). 2 security queries have been added with this release.
+
+CodeQL CLI
+----------
+
+There are no user-facing CLI changes in this release.
+
+Query Packs
+-----------
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The :code:`cpp/short-global-name` query will no longer give alerts for instantiations of template variables, only for the template itself.
+*   Fixed a false positive in :code:`cpp/overflow-buffer` when the type of the destination buffer is a reference to a class/struct type.
+
+Golang
+""""""
+
+*   Go 1.25 is now supported.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   The :code:`js/regex-injection` query no longer considers environment variables as sources by default. Environment variables can be re-enabled as sources by setting the threat model to include the "environment" category.
+
+New Queries
+~~~~~~~~~~~
+
+Rust
+""""
+
+*   Added a new query, :code:`rust/cleartext-storage-database`, for detecting cases where sensitive information is stored non-encrypted in a database.
+
+Language Libraries
+------------------
+
+Bug Fixes
+~~~~~~~~~
+
+Ruby
+""""
+
+*   Made the following changes to :code:`NetHttpRequest`
+
+    *   Adds :code:`connectionNode`, like other Ruby HTTP clients
+    *   Makes :code:`requestNode` and :code:`connectionNode` public so subclasses can use them
+    *   Adds detection of :code:`Net::HTTP.start`, a common way to make HTTP requests in Ruby
+
+Major Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Java/Kotlin
+"""""""""""
+
+*   Added library models for the relevant method calls under :code:`jakarta.servlet.ServletRequest` and :code:`jakarta.servlet.http.HttpServletRequest` as remote flow sources.
+
+Minor Analysis Improvements
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+C/C++
+"""""
+
+*   The guards libraries (:code:`semmle.code.cpp.controlflow.Guards` and :code:`semmle.code.cpp.controlflow.IRGuards`) have been improved to recognize more guards.
+*   Improved dataflow through global variables in the new dataflow library (:code:`semmle.code.cpp.dataflow.new.DataFlow` and :code:`semmle.code.cpp.dataflow.new.TaintTracking`). Queries based on these libraries will produce more results on codebases with many global variables.
+*   The global value numbering library (:code:`semmle.code.cpp.valuenumbering.GlobalValueNumbering` and :code:`semmle.code.cpp.ir.ValueNumbering`) has been improved so more expressions are assigned the same value number.
+
+Java/Kotlin
+"""""""""""
+
+*   Guard implication logic involving wrapper methods has been improved. In particular, this means fewer false positives for :code:`java/dereferenced-value-may-be-null`.
+
+JavaScript/TypeScript
+"""""""""""""""""""""
+
+*   Improved modeling of command-line argument parsing libraries `arg <https://www.npmjs.com/package/arg>`__, `args <https://www.npmjs.com/package/args>`__, `command-line-args <https://www.npmjs.com/package/command-line-args>`__ and `commander <https://www.npmjs.com/package/commander>`__
+
+Rust
+""""
+
+*   |link-code-let-chains-in-code-if-and-code-while-1|_ are now supported, as well as |link-code-if-let-guards-in-code-match-expressions-2|_.
+*   Added more detail to models of :code:`postgres`, :code:`rusqlite`, :code:`sqlx` and :code:`tokio-postgres`. This may improve query results, particularly for :code:`rust/sql-injection` and :code:`rust/cleartext-storage-database`.
+
+.. |link-code-let-chains-in-code-if-and-code-while-1| replace:: :code:`let` chains in :code:`if` and :code:`while`\ 
+.. _link-code-let-chains-in-code-if-and-code-while-1: https://doc.rust-lang.org/edition-guide/rust-2024/let-chains.html
+
+.. |link-code-if-let-guards-in-code-match-expressions-2| replace:: :code:`if let` guards in :code:`match` expressions
+.. _link-code-if-let-guards-in-code-match-expressions-2: https://rust-lang.github.io/rfcs/2294-if-let-guard.html
+
diff --git a/docs/codeql/codeql-overview/codeql-changelog/index.rst b/docs/codeql/codeql-overview/codeql-changelog/index.rst
index dcf6c7bcba02..c47ae0a688e4 100644
--- a/docs/codeql/codeql-overview/codeql-changelog/index.rst
+++ b/docs/codeql/codeql-overview/codeql-changelog/index.rst
@@ -11,6 +11,7 @@ A list of queries for each suite and language `is available here <https://docs.g
 .. toctree::
    :maxdepth: 1
 
+   codeql-cli-2.22.4
    codeql-cli-2.22.3
    codeql-cli-2.22.2
    codeql-cli-2.22.1
diff --git a/docs/codeql/ql-language-reference/aliases.rst b/docs/codeql/ql-language-reference/aliases.rst
index efbbef65cda0..ebecbdf0a2ba 100644
--- a/docs/codeql/ql-language-reference/aliases.rst
+++ b/docs/codeql/ql-language-reference/aliases.rst
@@ -137,6 +137,6 @@ During :ref:`name resolution <name-resolution>`, ambiguity between aliases from
 for the same module/type/predicate is allowed, but ambiguity between between aliases from distinct **strong**
 alias definitions is invalid QL.
 Likewise, for the purpose of applicative instantiation of :ref:`parameterised modules <parameterized-modules>`
-and `:ref:`parameterised module signatures <parameterized-module-signatures>`, aliases from **weak** alias
+and :ref:`parameterised module signatures <parameterized-module-signatures>`, aliases from **weak** alias
 definitions for instantiation arguments do not result in separate instantiations, but aliases from **strong**
 alias definitions for instantiation arguments do.
diff --git a/go/codeql-extractor.yml b/go/codeql-extractor.yml
index 49c8c75232f3..af9fca0462f3 100644
--- a/go/codeql-extractor.yml
+++ b/go/codeql-extractor.yml
@@ -9,6 +9,8 @@ column_kind: "utf8"
 build_modes:
   - autobuild
   - manual
+default_queries:
+  - codeql/go-queries
 github_api_languages:
   - Go
 scc_languages:
diff --git a/go/extractor/go.mod b/go/extractor/go.mod
index 8ec7ec72fc27..a23183400d0e 100644
--- a/go/extractor/go.mod
+++ b/go/extractor/go.mod
@@ -9,8 +9,8 @@ toolchain go1.25.0
 // when adding or removing dependencies, run
 //    bazel mod tidy
 require (
-	golang.org/x/mod v0.26.0
-	golang.org/x/tools v0.35.0
+	golang.org/x/mod v0.27.0
+	golang.org/x/tools v0.36.0
 )
 
 require golang.org/x/sync v0.16.0 // indirect
diff --git a/go/extractor/go.sum b/go/extractor/go.sum
index 58f0d0b933bb..e1a8435ba51c 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.26.0 h1:EGMPT//Ezu+ylkCijjPc+f4Aih7sZvaAr+O3EHBxvZg=
-golang.org/x/mod v0.26.0/go.mod h1:/j6NAhSk8iQ723BGAUyoAcn7SlD7s15Dp9Nd/SfeaFQ=
+golang.org/x/mod v0.27.0 h1:kb+q2PyFnEADO2IEF935ehFUXlWiNjJWtRNgBLSfbxQ=
+golang.org/x/mod v0.27.0/go.mod h1:rWI627Fq0DEoudcK+MBkNkCe0EetEaDSwJJkCcjpazc=
 golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
 golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
-golang.org/x/tools v0.35.0 h1:mBffYraMEf7aa0sB+NuKnuCy8qI/9Bughn8dC2Gu5r0=
-golang.org/x/tools v0.35.0/go.mod h1:NKdj5HkL/73byiZSJjqJgKn3ep7KjFkBOkR/Hps3VPw=
+golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
+golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index 596a873b2c52..c30f8de8bc9b 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.30.md b/go/ql/consistency-queries/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+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 8751a2162388..f04640951dec 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.29
+lastReleaseVersion: 1.0.30
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index ccfc15b01972..78d45bdad12f 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.29
+version: 1.0.30
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 0ddd2c37449a..686ac94e11bc 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 4.3.3
+
+No user-facing changes.
+
 ## 4.3.2
 
 No user-facing changes.
diff --git a/go/ql/lib/change-notes/released/4.3.3.md b/go/ql/lib/change-notes/released/4.3.3.md
new file mode 100644
index 000000000000..d6710bacd7f7
--- /dev/null
+++ b/go/ql/lib/change-notes/released/4.3.3.md
@@ -0,0 +1,3 @@
+## 4.3.3
+
+No user-facing changes.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index 5b8421b639ff..d7b7294771fb 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.3.2
+lastReleaseVersion: 4.3.3
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 7799e61ca856..9bca1b6e509e 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 4.3.2
+version: 4.3.3
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/lib/semmle/go/StringOps.qll b/go/ql/lib/semmle/go/StringOps.qll
index 351617abf9de..3463e4fdf878 100644
--- a/go/ql/lib/semmle/go/StringOps.qll
+++ b/go/ql/lib/semmle/go/StringOps.qll
@@ -306,11 +306,12 @@ module StringOps {
      */
     class StringFormatCall extends DataFlow::CallNode {
       string fmt;
-      Range f;
 
       StringFormatCall() {
-        this = f.getACall() and
-        fmt = this.getArgument(f.getFormatStringIndex()).getStringValue() and
+        exists(Range f |
+          this = f.getACall() and
+          fmt = this.getArgument(f.getFormatStringIndex()).getStringValue()
+        ) and
         fmt.regexpMatch(getFormatComponentRegex() + "*")
       }
 
diff --git a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
index 2cd1bbcc7476..14ff455646c9 100644
--- a/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
+++ b/go/ql/lib/semmle/go/dataflow/internal/DataFlowUtil.qll
@@ -367,7 +367,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`, which is represented by `ap`.
    *
    * This predicate exists to enforce a good join order in `getAGuardedNode`.
@@ -378,7 +378,7 @@ module BarrierGuard<guardChecksSig/3 guardChecks> {
   }
 
   /**
-   * Holds if `guard` marks a point in the control-flow graph where this node
+   * Holds if `guard` marks a point in the control-flow graph where `g`
    * is known to validate `nd`.
    */
   private predicate guards(Node g, ControlFlow::ConditionGuardNode guard, Node nd) {
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index f86e390b56d4..7ec3a3eab648 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.4
+
+No user-facing changes.
+
 ## 1.4.3
 
 No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.4.4.md b/go/ql/src/change-notes/released/1.4.4.md
new file mode 100644
index 000000000000..cb7dd204b9c2
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.4.4.md
@@ -0,0 +1,3 @@
+## 1.4.4
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 08f88b689fb6..1dfca6daa3b1 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.3
+lastReleaseVersion: 1.4.4
diff --git a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
index eccb0b735896..f3f4c15f0085 100644
--- a/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
+++ b/go/ql/src/experimental/IntegerOverflow/RangeAnalysis.qll
@@ -74,7 +74,7 @@ float getAnUpperBound(Expr expr) {
             result = getAnUpperBound(greater.asExpr()) + bias
           )
         else
-          //If not, find the coresponding `SsaDefinition`, then call `getAnSsaUpperBound` on it.
+          //If not, find the corresponding `SsaDefinition`, then call `getAnSsaUpperBound` on it.
           result = getAnSsaUpperBound(v.getDefinition())
       )
     )
@@ -231,7 +231,7 @@ float getALowerBound(Expr expr) {
             result = lbs - bias
           )
         else
-          //find coresponding SSA definition and calls `getAnSsaLowerBound` on it.
+          //find corresponding SSA definition and calls `getAnSsaLowerBound` on it.
           result = getAnSsaLowerBound(v.getDefinition())
       )
     )
@@ -347,91 +347,85 @@ float getALowerBound(Expr expr) {
  * Gets a possible upper bound of SSA definition `def`.
  */
 float getAnSsaUpperBound(SsaDefinition def) {
-  if recursiveSelfDef(def)
-  then none()
-  else (
-    if def instanceof SsaExplicitDefinition
-    then
-      exists(SsaExplicitDefinition explicitDef | explicitDef = def |
-        //SSA definition coresponding to a `SimpleAssignStmt`
-        if explicitDef.getInstruction() instanceof IR::AssignInstruction
-        then
-          exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
-            assignInstr = explicitDef.getInstruction() and
-            assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
-            result = getAnUpperBound(simpleAssign.getRhs())
-          )
-          or
-          //SSA definition coresponding to a ValueSpec(used in a variable declaration)
-          exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
-            declInstr = explicitDef.getInstruction() and
-            declInstr = IR::initInstruction(vs, i) and
-            init = vs.getInit(i) and
-            result = getAnUpperBound(init)
-          )
-          or
-          //SSA definition coresponding to an `AddAssignStmt` (x += y) or `SubAssignStmt` (x -= y)
-          exists(
-            IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
-            CompoundAssignStmt compoundAssign, float prevBound, float delta
-          |
-            assignInstr = explicitDef.getInstruction() and
-            getAUse(prevDef) = compoundAssign.getLhs() and
-            assignInstr = IR::assignInstruction(compoundAssign, 0) and
-            prevBound = getAnSsaUpperBound(prevDef) and
-            if compoundAssign instanceof AddAssignStmt
-            then
-              delta = getAnUpperBound(compoundAssign.getRhs()) and
-              result = addRoundingUp(prevBound, delta)
-            else
-              if compoundAssign instanceof SubAssignStmt
-              then
-                delta = getALowerBound(compoundAssign.getRhs()) and
-                result = addRoundingUp(prevBound, -delta)
-              else none()
+  not recursiveSelfDef(def) and
+  (
+    def instanceof SsaExplicitDefinition and
+    exists(SsaExplicitDefinition explicitDef | explicitDef = def |
+      //SSA definition corresponding to a `SimpleAssignStmt`
+      if explicitDef.getInstruction() instanceof IR::AssignInstruction
+      then
+        exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
+          assignInstr = explicitDef.getInstruction() and
+          assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
+          result = getAnUpperBound(simpleAssign.getRhs())
+        )
+        or
+        //SSA definition corresponding to a ValueSpec(used in a variable declaration)
+        exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
+          declInstr = explicitDef.getInstruction() and
+          declInstr = IR::initInstruction(vs, i) and
+          init = vs.getInit(i) and
+          result = getAnUpperBound(init)
+        )
+        or
+        //SSA definition corresponding to an `AddAssignStmt` (x += y) or `SubAssignStmt` (x -= y)
+        exists(
+          IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
+          CompoundAssignStmt compoundAssign, float prevBound, float delta
+        |
+          assignInstr = explicitDef.getInstruction() and
+          getAUse(prevDef) = compoundAssign.getLhs() and
+          assignInstr = IR::assignInstruction(compoundAssign, 0) and
+          prevBound = getAnSsaUpperBound(prevDef) and
+          (
+            compoundAssign instanceof AddAssignStmt and
+            delta = getAnUpperBound(compoundAssign.getRhs()) and
+            result = addRoundingUp(prevBound, delta)
+            or
+            compoundAssign instanceof SubAssignStmt and
+            delta = getALowerBound(compoundAssign.getRhs()) and
+            result = addRoundingUp(prevBound, -delta)
           )
-        else
-          //SSA definition coresponding to an `IncDecStmt`
-          if explicitDef.getInstruction() instanceof IR::IncDecInstruction
-          then
-            exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-              instr = explicitDef.getInstruction() and
-              exprLB = getAnUpperBound(incOrDec.getOperand()) and
-              instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
-              (
-                //IncStmt(x++)
-                exists(IncStmt inc |
-                  inc = incOrDec and
-                  result = addRoundingUp(exprLB, 1)
-                )
-                or
-                //DecStmt(x--)
-                exists(DecStmt dec |
-                  dec = incOrDec and
-                  result = addRoundingUp(exprLB, -1)
-                )
+        )
+      else
+        //SSA definition corresponding to an `IncDecStmt`
+        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
+        then
+          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
+            instr = explicitDef.getInstruction() and
+            exprLB = getAnUpperBound(incOrDec.getOperand()) and
+            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
+            (
+              //IncStmt(x++)
+              exists(IncStmt inc |
+                inc = incOrDec and
+                result = addRoundingUp(exprLB, 1)
               )
-            )
-          else
-            //SSA definition coreponding to the init of the parameter
-            if explicitDef.getInstruction() instanceof IR::InitParameterInstruction
-            then
-              exists(IR::InitParameterInstruction instr, Parameter p |
-                instr = explicitDef.getInstruction() and
-                IR::initParamInstruction(p) = instr and
-                result = typeMaxValue(p.getType())
+              or
+              //DecStmt(x--)
+              exists(DecStmt dec |
+                dec = incOrDec and
+                result = addRoundingUp(exprLB, -1)
               )
-            else none()
-      )
-    else
-      //this SSA definition is a phi node.
-      if def instanceof SsaPhiNode
-      then
-        exists(SsaPhiNode phi |
-          phi = def and
-          result = getAnSsaUpperBound(phi.getAnInput().getDefinition())
+            )
+          )
+        else (
+          //SSA definition coreponding to the init of the parameter
+          explicitDef.getInstruction() instanceof IR::InitParameterInstruction and
+          exists(IR::InitParameterInstruction instr, Parameter p |
+            instr = explicitDef.getInstruction() and
+            IR::initParamInstruction(p) = instr and
+            result = typeMaxValue(p.getType())
+          )
         )
-      else none()
+    )
+    or
+    //this SSA definition is a phi node.
+    def instanceof SsaPhiNode and
+    exists(SsaPhiNode phi |
+      phi = def and
+      result = getAnSsaUpperBound(phi.getAnInput().getDefinition())
+    )
   )
 }
 
@@ -439,91 +433,85 @@ float getAnSsaUpperBound(SsaDefinition def) {
  * Gets a possible lower bound of SSA definition `def`.
  */
 float getAnSsaLowerBound(SsaDefinition def) {
-  if recursiveSelfDef(def)
-  then none()
-  else (
-    if def instanceof SsaExplicitDefinition
-    then
-      exists(SsaExplicitDefinition explicitDef | explicitDef = def |
-        if explicitDef.getInstruction() instanceof IR::AssignInstruction
-        then
-          //SimpleAssignStmt
-          exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
-            assignInstr = explicitDef.getInstruction() and
-            assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
-            result = getALowerBound(simpleAssign.getRhs())
-          )
-          or
-          //ValueSpec
-          exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
-            declInstr = explicitDef.getInstruction() and
-            declInstr = IR::initInstruction(vs, i) and
-            init = vs.getInit(i) and
-            result = getALowerBound(init)
-          )
-          or
-          //AddAssignStmt(x += y)
-          exists(
-            IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
-            CompoundAssignStmt compoundAssign, float prevBound, float delta
-          |
-            assignInstr = explicitDef.getInstruction() and
-            getAUse(prevDef) = compoundAssign.getLhs() and
-            assignInstr = IR::assignInstruction(compoundAssign, 0) and
-            prevBound = getAnSsaLowerBound(prevDef) and
-            if compoundAssign instanceof AddAssignStmt
-            then
-              delta = getALowerBound(compoundAssign.getRhs()) and
-              result = addRoundingDown(prevBound, delta)
-            else
-              if compoundAssign instanceof SubAssignStmt
-              then
-                delta = getAnUpperBound(compoundAssign.getRhs()) and
-                result = addRoundingDown(prevBound, -delta)
-              else none()
+  not recursiveSelfDef(def) and
+  (
+    def instanceof SsaExplicitDefinition and
+    exists(SsaExplicitDefinition explicitDef | explicitDef = def |
+      if explicitDef.getInstruction() instanceof IR::AssignInstruction
+      then
+        //SimpleAssignStmt
+        exists(IR::AssignInstruction assignInstr, SimpleAssignStmt simpleAssign |
+          assignInstr = explicitDef.getInstruction() and
+          assignInstr.getRhs().(IR::EvalInstruction).getExpr() = simpleAssign.getRhs() and
+          result = getALowerBound(simpleAssign.getRhs())
+        )
+        or
+        //ValueSpec
+        exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
+          declInstr = explicitDef.getInstruction() and
+          declInstr = IR::initInstruction(vs, i) and
+          init = vs.getInit(i) and
+          result = getALowerBound(init)
+        )
+        or
+        //AddAssignStmt(x += y)
+        exists(
+          IR::AssignInstruction assignInstr, SsaExplicitDefinition prevDef,
+          CompoundAssignStmt compoundAssign, float prevBound, float delta
+        |
+          assignInstr = explicitDef.getInstruction() and
+          getAUse(prevDef) = compoundAssign.getLhs() and
+          assignInstr = IR::assignInstruction(compoundAssign, 0) and
+          prevBound = getAnSsaLowerBound(prevDef) and
+          (
+            compoundAssign instanceof AddAssignStmt and
+            delta = getALowerBound(compoundAssign.getRhs()) and
+            result = addRoundingDown(prevBound, delta)
+            or
+            compoundAssign instanceof SubAssignStmt and
+            delta = getAnUpperBound(compoundAssign.getRhs()) and
+            result = addRoundingDown(prevBound, -delta)
           )
-        else
-          //IncDecStmt
-          if explicitDef.getInstruction() instanceof IR::IncDecInstruction
-          then
-            exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
-              instr = explicitDef.getInstruction() and
-              exprLB = getALowerBound(incOrDec.getOperand()) and
-              instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
-              (
-                //IncStmt(x++)
-                exists(IncStmt inc |
-                  inc = incOrDec and
-                  result = addRoundingDown(exprLB, 1)
-                )
-                or
-                //DecStmt(x--)
-                exists(DecStmt dec |
-                  dec = incOrDec and
-                  result = addRoundingDown(exprLB, -1)
-                )
+        )
+      else
+        //IncDecStmt
+        if explicitDef.getInstruction() instanceof IR::IncDecInstruction
+        then
+          exists(IncDecStmt incOrDec, IR::IncDecInstruction instr, float exprLB |
+            instr = explicitDef.getInstruction() and
+            exprLB = getALowerBound(incOrDec.getOperand()) and
+            instr.getRhs().(IR::EvalIncDecRhsInstruction).getStmt() = incOrDec and
+            (
+              //IncStmt(x++)
+              exists(IncStmt inc |
+                inc = incOrDec and
+                result = addRoundingDown(exprLB, 1)
               )
-            )
-          else
-            //init of the function parameter
-            if explicitDef.getInstruction() instanceof IR::InitParameterInstruction
-            then
-              exists(IR::InitParameterInstruction instr, Parameter p |
-                instr = explicitDef.getInstruction() and
-                IR::initParamInstruction(p) = instr and
-                result = typeMinValue(p.getType())
+              or
+              //DecStmt(x--)
+              exists(DecStmt dec |
+                dec = incOrDec and
+                result = addRoundingDown(exprLB, -1)
               )
-            else none()
-      )
-    else
-      //phi node
-      if def instanceof SsaPhiNode
-      then
-        exists(SsaPhiNode phi |
-          phi = def and
-          result = getAnSsaLowerBound(phi.getAnInput().getDefinition())
+            )
+          )
+        else (
+          //init of the function parameter
+          explicitDef.getInstruction() instanceof IR::InitParameterInstruction and
+          exists(IR::InitParameterInstruction instr, Parameter p |
+            instr = explicitDef.getInstruction() and
+            IR::initParamInstruction(p) = instr and
+            result = typeMinValue(p.getType())
+          )
         )
-      else none()
+    )
+    or
+    //phi node
+    def instanceof SsaPhiNode and
+    exists(SsaPhiNode phi |
+      phi = def and
+      result = getAnSsaLowerBound(phi.getAnInput().getDefinition())
+    )
   )
 }
 
@@ -533,13 +521,13 @@ float getAnSsaLowerBound(SsaDefinition def) {
  * The structure of this function needs to be same as `getAnSsaLowerBound`
  */
 predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
-  //SSA definition coresponding to a `SimpleAssignStmt`
+  //SSA definition corresponding to a `SimpleAssignStmt`
   exists(SimpleAssignStmt simpleAssign |
     nextDef.(SsaExplicitDefinition).getInstruction() = IR::assignInstruction(simpleAssign, _) and
     ssaDependsOnExpr(prevDef, simpleAssign.getRhs())
   )
   or
-  //SSA definition coresponding to a `ValueSpec`(used in variable declaration)
+  //SSA definition corresponding to a `ValueSpec`(used in variable declaration)
   exists(IR::AssignInstruction declInstr, ValueSpec vs, int i, Expr init |
     declInstr = nextDef.(SsaExplicitDefinition).getInstruction() and
     declInstr = IR::initInstruction(vs, i) and
@@ -547,7 +535,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     ssaDependsOnExpr(prevDef, init)
   )
   or
-  //SSA definition coresponding to a `AddAssignStmt` or `SubAssignStmt`
+  //SSA definition corresponding to a `AddAssignStmt` or `SubAssignStmt`
   exists(CompoundAssignStmt compoundAssign |
     (compoundAssign instanceof AddAssignStmt or compoundAssign instanceof SubAssignStmt) and
     nextDef.(SsaExplicitDefinition).getInstruction() = IR::assignInstruction(compoundAssign, 0) and
@@ -557,7 +545,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     )
   )
   or
-  //SSA definition coresponding to a `IncDecStmt`
+  //SSA definition corresponding to a `IncDecStmt`
   exists(IncDecStmt incDec |
     nextDef
         .(SsaExplicitDefinition)
@@ -569,7 +557,7 @@ predicate ssaDependsOnSsa(SsaDefinition nextDef, SsaDefinition prevDef) {
     ssaDependsOnExpr(prevDef, incDec.getOperand())
   )
   or
-  //if `nextDef` coresponding to the init of a parameter, there is no coresponding `prevDef`
+  //if `nextDef` corresponding to the init of a parameter, there is no corresponding `prevDef`
   //if `nextDef` is a phi node and `prevDef` is one of the input of the phi node, then `nextDef` depends on `prevDef` directly.
   exists(SsaPhiNode phi | nextDef = phi and phi.getAnInput().getDefinition() = prevDef)
 }
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index d468ea88ecad..d2dbfbdf1fff 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.4.3
+version: 1.4.4
 groups:
   - go
   - queries
diff --git a/java/documentation/library-coverage/coverage.csv b/java/documentation/library-coverage/coverage.csv
index 7ec0b4c5f0fc..1d1f9a1545ec 100644
--- a/java/documentation/library-coverage/coverage.csv
+++ b/java/documentation/library-coverage/coverage.csv
@@ -76,7 +76,7 @@ jakarta.activation,2,,2,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,1,,,,,,,,,,,,,,,,2,
 jakarta.faces.context,4,7,,,,,,,,,,,,,,2,,,,,,,,,,,2,,,,,,,,,,,,,,,,,,,,,,,,7,,
 jakarta.json,,,123,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,100,23
 jakarta.persistence,2,,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,,,,,,1,
-jakarta.servlet,2,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,1,,
+jakarta.servlet,2,19,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,19,,
 jakarta.ws.rs.client,1,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,1,,,,,,,,,,,,,,,,,
 jakarta.ws.rs.container,,9,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,9,,
 jakarta.ws.rs.core,2,,149,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,,2,,,,,,,,,94,55
diff --git a/java/documentation/library-coverage/coverage.rst b/java/documentation/library-coverage/coverage.rst
index aa6a3f2c1713..d70f9c2f463d 100644
--- a/java/documentation/library-coverage/coverage.rst
+++ b/java/documentation/library-coverage/coverage.rst
@@ -19,9 +19,9 @@ Java framework & library support
    JBoss Logging,``org.jboss.logging``,,,324,,,,,,
    `JSON-java <https://github.com/stleary/JSON-java>`_,``org.json``,,236,,,,,,,
    Java Standard Library,``java.*``,10,4621,260,99,,9,,,26
-   Java extensions,"``javax.*``, ``jakarta.*``",69,4159,90,10,4,2,1,1,4
+   Java extensions,"``javax.*``, ``jakarta.*``",87,4159,90,10,4,2,1,1,4
    Kotlin Standard Library,``kotlin*``,,1849,16,14,,,,,2
    `Spring <https://spring.io/>`_,``org.springframework.*``,38,486,143,26,,28,14,,35
    Others,"``actions.osgi``, ``antlr``, ``ch.ethz.ssh2``, ``cn.hutool.core.codec``, ``com.alibaba.com.caucho.hessian.io``, ``com.alibaba.druid.sql``, ``com.alibaba.fastjson2``, ``com.amazonaws.auth``, ``com.auth0.jwt.algorithms``, ``com.azure.identity``, ``com.caucho.burlap.io``, ``com.caucho.hessian.io``, ``com.cedarsoftware.util.io``, ``com.esotericsoftware.kryo.io``, ``com.esotericsoftware.kryo5.io``, ``com.esotericsoftware.yamlbeans``, ``com.fasterxml.jackson.core``, ``com.fasterxml.jackson.databind``, ``com.google.gson``, ``com.hubspot.jinjava``, ``com.jcraft.jsch``, ``com.microsoft.sqlserver.jdbc``, ``com.mitchellbosecke.pebble``, ``com.mongodb``, ``com.opensymphony.xwork2``, ``com.rabbitmq.client``, ``com.sshtools.j2ssh.authentication``, ``com.sun.crypto.provider``, ``com.sun.jndi.ldap``, ``com.sun.net.httpserver``, ``com.sun.net.ssl``, ``com.sun.rowset``, ``com.sun.security.auth.module``, ``com.sun.security.ntlm``, ``com.sun.security.sasl.digest``, ``com.thoughtworks.xstream``, ``com.trilead.ssh2``, ``com.unboundid.ldap.sdk``, ``com.zaxxer.hikari``, ``flexjson``, ``freemarker.cache``, ``freemarker.template``, ``groovy.lang``, ``groovy.text``, ``groovy.util``, ``hudson``, ``io.jsonwebtoken``, ``io.netty.bootstrap``, ``io.netty.buffer``, ``io.netty.channel``, ``io.netty.handler.codec``, ``io.netty.handler.ssl``, ``io.netty.handler.stream``, ``io.netty.resolver``, ``io.netty.util``, ``io.undertow.server.handlers.resource``, ``javafx.scene.web``, ``jenkins``, ``jodd.json``, ``liquibase.database.jvm``, ``liquibase.statement.core``, ``net.lingala.zip4j``, ``net.schmizz.sshj``, ``net.sf.json``, ``net.sf.saxon.s9api``, ``ognl``, ``okhttp3``, ``org.acegisecurity``, ``org.antlr.runtime``, ``org.apache.commons.codec``, ``org.apache.commons.compress.archivers.tar``, ``org.apache.commons.exec``, ``org.apache.commons.httpclient.util``, ``org.apache.commons.jelly``, ``org.apache.commons.jexl2``, ``org.apache.commons.jexl3``, ``org.apache.commons.lang``, ``org.apache.commons.logging``, ``org.apache.commons.net``, ``org.apache.commons.ognl``, ``org.apache.cxf.catalog``, ``org.apache.cxf.common.classloader``, ``org.apache.cxf.common.jaxb``, ``org.apache.cxf.common.logging``, ``org.apache.cxf.configuration.jsse``, ``org.apache.cxf.helpers``, ``org.apache.cxf.resource``, ``org.apache.cxf.staxutils``, ``org.apache.cxf.tools.corba.utils``, ``org.apache.cxf.tools.util``, ``org.apache.cxf.transform``, ``org.apache.directory.ldap.client.api``, ``org.apache.hadoop.fs``, ``org.apache.hadoop.hive.metastore``, ``org.apache.hadoop.hive.ql.exec``, ``org.apache.hadoop.hive.ql.metadata``, ``org.apache.hc.client5.http.async.methods``, ``org.apache.hc.client5.http.classic.methods``, ``org.apache.hc.client5.http.fluent``, ``org.apache.hive.hcatalog.templeton``, ``org.apache.ibatis.jdbc``, ``org.apache.ibatis.mapping``, ``org.apache.log4j``, ``org.apache.shiro.authc``, ``org.apache.shiro.codec``, ``org.apache.shiro.jndi``, ``org.apache.shiro.mgt``, ``org.apache.sshd.client.session``, ``org.apache.struts.beanvalidation.validation.interceptor``, ``org.apache.struts2``, ``org.apache.tools.ant``, ``org.apache.tools.zip``, ``org.apache.velocity.app``, ``org.apache.velocity.runtime``, ``org.codehaus.cargo.container.installer``, ``org.codehaus.groovy.control``, ``org.dom4j``, ``org.eclipse.jetty.client``, ``org.exolab.castor.xml``, ``org.fusesource.leveldbjni``, ``org.geogebra.web.full.main``, ``org.gradle.api.file``, ``org.hibernate``, ``org.ho.yaml``, ``org.influxdb``, ``org.jabsorb``, ``org.jboss.vfs``, ``org.jdbi.v3.core``, ``org.jenkins.ui.icon``, ``org.jenkins.ui.symbol``, ``org.jooq``, ``org.keycloak.models.map.storage``, ``org.kohsuke.stapler``, ``org.lastaflute.web``, ``org.mvel2``, ``org.openjdk.jmh.runner.options``, ``org.owasp.esapi``, ``org.pac4j.jwt.config.encryption``, ``org.pac4j.jwt.config.signature``, ``org.scijava.log``, ``org.slf4j``, ``org.thymeleaf``, ``org.xml.sax``, ``org.xmlpull.v1``, ``org.yaml.snakeyaml``, ``play.libs.ws``, ``play.mvc``, ``ratpack.core.form``, ``ratpack.core.handling``, ``ratpack.core.http``, ``ratpack.exec``, ``ratpack.form``, ``ratpack.func``, ``ratpack.handling``, ``ratpack.http``, ``ratpack.util``, ``retrofit2``, ``software.amazon.awssdk.transfer.s3.model``, ``sun.jvmstat.perfdata.monitor.protocol.local``, ``sun.jvmstat.perfdata.monitor.protocol.rmi``, ``sun.misc``, ``sun.net.ftp``, ``sun.net.www.protocol.http``, ``sun.security.acl``, ``sun.security.jgss.krb5``, ``sun.security.krb5``, ``sun.security.pkcs``, ``sun.security.pkcs11``, ``sun.security.provider``, ``sun.security.ssl``, ``sun.security.x509``, ``sun.tools.jconsole``",133,10525,927,140,6,22,18,,208
-   Totals,,312,26328,2656,404,16,128,33,1,409
+   Totals,,330,26328,2656,404,16,128,33,1,409
 
diff --git a/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
index 7a1a986b2aa1..852389b950b5 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-quality-extended.qls.expected
@@ -73,6 +73,7 @@ ql/java/ql/src/Violations of Best Practice/Exception Handling/IgnoreExceptionalR
 ql/java/ql/src/Violations of Best Practice/Exception Handling/NumberFormatException.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingMethodNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
@@ -80,7 +81,10 @@ ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsFieldC
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/SameNameAsSuper.ql
 ql/java/ql/src/Violations of Best Practice/Records/IgnoredSerializationMembersOfRecordClass.ql
 ql/java/ql/src/Violations of Best Practice/SpecialCharactersInLiterals/NonExplicitControlAndWhitespaceCharsInLiterals.ql
+ql/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToStringToString.ql
+ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DefaultToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DoNotCallFinalize.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/PrintLnArray.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
index 17253dbe0f89..eb502feb6bac 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-quality.qls.expected
@@ -71,6 +71,7 @@ ql/java/ql/src/Violations of Best Practice/Exception Handling/IgnoreExceptionalR
 ql/java/ql/src/Violations of Best Practice/Exception Handling/NumberFormatException.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/AbstractToConcreteCollection.ql
 ql/java/ql/src/Violations of Best Practice/Implementation Hiding/ExposeRepresentation.ql
+ql/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/AmbiguousOuterSuper.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingMethodNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
@@ -78,6 +79,7 @@ ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsFieldC
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/SameNameAsSuper.ql
 ql/java/ql/src/Violations of Best Practice/Records/IgnoredSerializationMembersOfRecordClass.ql
 ql/java/ql/src/Violations of Best Practice/SpecialCharactersInLiterals/NonExplicitControlAndWhitespaceCharsInLiterals.ql
+ql/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToStringToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DefaultToString.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/DoNotCallFinalize.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
index 3290e0d84b0e..afa6cebba311 100644
--- a/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-code-scanning.qls.expected
@@ -27,6 +27,7 @@ ql/java/ql/src/Security/CWE/CWE-113/ResponseSplitting.ql
 ql/java/ql/src/Security/CWE/CWE-1204/StaticInitializationVector.ql
 ql/java/ql/src/Security/CWE/CWE-134/ExternallyControlledFormatString.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
 ql/java/ql/src/Security/CWE/CWE-266/IntentUriPermissionManipulation.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected b/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
index f4317f8e2a5c..f5470c463c30 100644
--- a/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-security-and-quality.qls.expected
@@ -143,6 +143,7 @@ ql/java/ql/src/Security/CWE/CWE-200/AndroidSensitiveTextField.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
diff --git a/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected b/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
index 209777cf4d98..a3ebc029d287 100644
--- a/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
+++ b/java/ql/integration-tests/java/query-suite/java-security-extended.qls.expected
@@ -46,6 +46,7 @@ ql/java/ql/src/Security/CWE/CWE-200/AndroidSensitiveTextField.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsAllowsContentAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/AndroidWebViewSettingsFileAccess.ql
 ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuators.ql
+ql/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
 ql/java/ql/src/Security/CWE/CWE-200/TempDirLocalInformationDisclosure.ql
 ql/java/ql/src/Security/CWE/CWE-209/SensitiveDataExposureThroughErrorMessage.ql
 ql/java/ql/src/Security/CWE/CWE-209/StackTraceExposure.ql
diff --git a/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected b/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
index 1f58e51ad800..3a1cd4e1adbc 100644
--- a/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
+++ b/java/ql/integration-tests/java/query-suite/not_included_in_qls.expected
@@ -66,7 +66,6 @@ ql/java/ql/src/Frameworks/Spring/XML Configuration Errors/MissingSetters.ql
 ql/java/ql/src/Language Abuse/CastThisToTypeParameter.ql
 ql/java/ql/src/Language Abuse/DubiousDowncastOfThis.ql
 ql/java/ql/src/Language Abuse/DubiousTypeTestOfThis.ql
-ql/java/ql/src/Language Abuse/EmptyStatement.ql
 ql/java/ql/src/Language Abuse/EnumIdentifier.ql
 ql/java/ql/src/Language Abuse/ImplementsAnnotation.ql
 ql/java/ql/src/Language Abuse/MissedTernaryOpportunity.ql
@@ -187,7 +186,6 @@ ql/java/ql/src/Violations of Best Practice/Magic Constants/MagicNumbersUseConsta
 ql/java/ql/src/Violations of Best Practice/Magic Constants/MagicStringsUseConstant.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverridesNames.ql
 ql/java/ql/src/Violations of Best Practice/Naming Conventions/LocalShadowsField.ql
-ql/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
 ql/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql
 ql/java/ql/src/Violations of Best Practice/legacy/AutoBoxing.ql
 ql/java/ql/src/Violations of Best Practice/legacy/FinallyMayNotComplete.ql
@@ -196,7 +194,6 @@ ql/java/ql/src/Violations of Best Practice/legacy/ParameterAssignment.ql
 ql/java/ql/src/Violations of Best Practice/legacy/UnnecessaryCast.ql
 ql/java/ql/src/Violations of Best Practice/legacy/UnnecessaryImport.ql
 ql/java/ql/src/definitions.ql
-ql/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-020/Log4jJndiInjection.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-036/OpenStream.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-073/FilePathInjection.ql
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index f3b7648c5ed8..448b04bdc24e 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.6.1
+
+No user-facing changes.
+
 ## 7.6.0
 
 ### Major Analysis Improvements
diff --git a/java/ql/lib/change-notes/released/7.6.1.md b/java/ql/lib/change-notes/released/7.6.1.md
new file mode 100644
index 000000000000..fd15c208d88d
--- /dev/null
+++ b/java/ql/lib/change-notes/released/7.6.1.md
@@ -0,0 +1,3 @@
+## 7.6.1
+
+No user-facing changes.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index dd20d7a96326..0e73c8335724 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.6.0
+lastReleaseVersion: 7.6.1
diff --git a/java/ql/lib/experimental/quantum/JCA.qll b/java/ql/lib/experimental/quantum/JCA.qll
index dc86c4637505..108835c2c94e 100644
--- a/java/ql/lib/experimental/quantum/JCA.qll
+++ b/java/ql/lib/experimental/quantum/JCA.qll
@@ -269,7 +269,7 @@ module JCAModel {
   }
 
   /**
-   * Data-flow configuration modelling flow from a cipher string literal to a cipher algorithm consumer.
+   * Data-flow configuration modeling flow from a cipher string literal to a cipher algorithm consumer.
    */
   private module CipherAlgorithmStringToCipherConsumerConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node src) { src.asExpr() instanceof CipherStringLiteral }
@@ -404,9 +404,7 @@ module JCAModel {
    * For example, in `Cipher.getInstance(algorithm)`, this class represents `algorithm`.
    */
   class CipherGetInstanceAlgorithmArg extends CipherAlgorithmValueConsumer instanceof Expr {
-    CipherGetInstanceCall call;
-
-    CipherGetInstanceAlgorithmArg() { this = call.getAlgorithmArg() }
+    CipherGetInstanceAlgorithmArg() { this = any(CipherGetInstanceCall call).getAlgorithmArg() }
 
     override Crypto::ConsumerInputDataFlowNode getInputNode() { result.asExpr() = this }
 
@@ -1333,7 +1331,7 @@ module JCAModel {
   }
 
   /**
-   * Data-flow configuration modelling flow from a key agreement string literal to a key agreement algorithm consumer.
+   * Data-flow configuration modeling flow from a key agreement string literal to a key agreement algorithm consumer.
    */
   private module KeyAgreementAlgorithmStringToConsumerConfig implements DataFlow::ConfigSig {
     predicate isSource(DataFlow::Node src) { src.asExpr() instanceof KeyAgreementStringLiteral }
@@ -1539,11 +1537,9 @@ module JCAModel {
   }
 
   class MacOperationCall extends Crypto::MacOperationInstance instanceof MethodCall {
-    Expr output;
-
     MacOperationCall() {
       super.getMethod().getDeclaringType().hasQualifiedName("javax.crypto", "Mac") and
-      (
+      exists(Expr output |
         super.getMethod().hasStringSignature(["doFinal()", "doFinal(byte[])"]) and this = output
         or
         super.getMethod().hasStringSignature("doFinal(byte[], int)") and
diff --git a/java/ql/lib/experimental/quantum/Language.qll b/java/ql/lib/experimental/quantum/Language.qll
index 975a8ad8e1fe..e203d2a15873 100644
--- a/java/ql/lib/experimental/quantum/Language.qll
+++ b/java/ql/lib/experimental/quantum/Language.qll
@@ -113,7 +113,7 @@ private class ConstantDataSource extends Crypto::GenericConstantSourceInstance i
 }
 
 /**
- * An instance of random number generation, modelled as the expression
+ * An instance of random number generation, modeled as the expression
  * tied to an output node (i.e., the result of the source of randomness)
  */
 abstract class RandomnessInstance extends Crypto::RandomNumberGenerationInstance {
diff --git a/java/ql/lib/printAst.ql b/java/ql/lib/printAst.ql
index cd72403de90c..8ea0efaed5f1 100644
--- a/java/ql/lib/printAst.ql
+++ b/java/ql/lib/printAst.ql
@@ -18,8 +18,8 @@ external string selectedSourceFile();
 
 class PrintAstConfigurationOverride extends PrintAstConfiguration {
   /**
-   * Holds if the location matches the selected file in the VS Code extension and
-   * the element is `fromSource`.
+   * Holds if the location `l` matches the selected file in the VS Code extension and
+   * the element `e` is `fromSource`.
    */
   override predicate shouldPrint(Element e, Location l) {
     super.shouldPrint(e, l) and
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index d03a86de7929..4ae667d82337 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 7.6.0
+version: 7.6.1
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll b/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
index 0c69f45c56fa..1655ed2d6484 100644
--- a/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
+++ b/java/ql/lib/semmle/code/configfiles/ConfigFiles.qll
@@ -70,7 +70,12 @@ class ConfigValue extends @configValue, ConfigLocatable {
   override string toString() { result = this.getValue() }
 }
 
+/** A `.properties` file. */
+class PropertiesFile extends File {
+  PropertiesFile() { this.getExtension() = "properties" }
+}
+
 /** A Java property is a name-value pair in a `.properties` file. */
 class JavaProperty extends ConfigPair {
-  JavaProperty() { this.getFile().getExtension() = "properties" }
+  JavaProperty() { this.getFile() instanceof PropertiesFile }
 }
diff --git a/java/ql/lib/semmle/code/java/Concurrency.qll b/java/ql/lib/semmle/code/java/Concurrency.qll
index 0e510db3443b..7322f16068c0 100644
--- a/java/ql/lib/semmle/code/java/Concurrency.qll
+++ b/java/ql/lib/semmle/code/java/Concurrency.qll
@@ -26,7 +26,8 @@ predicate locallySynchronizedOnThis(Expr e, RefType thisType) {
 }
 
 /**
- * Holds if `e` is synchronized by a `synchronized` modifier on the enclosing (static) method.
+ * Holds if `e` is synchronized by a `synchronized` modifier on the enclosing (static) method
+ * declared in the type `classType`.
  */
 predicate locallySynchronizedOnClass(Expr e, RefType classType) {
   exists(SynchronizedCallable c | c = e.getEnclosingCallable() |
diff --git a/java/ql/lib/semmle/code/java/Conversions.qll b/java/ql/lib/semmle/code/java/Conversions.qll
index 76b74fd1eb7c..779eb7620bec 100644
--- a/java/ql/lib/semmle/code/java/Conversions.qll
+++ b/java/ql/lib/semmle/code/java/Conversions.qll
@@ -100,12 +100,12 @@ class InvocationConversionContext extends ConversionSite {
  * See the Java Language Specification, Section 5.4.
  */
 class StringConversionContext extends ConversionSite {
-  AddExpr a;
-
   StringConversionContext() {
-    a.getAnOperand() = this and
-    not this.getType() instanceof TypeString and
-    a.getAnOperand().getType() instanceof TypeString
+    exists(AddExpr a |
+      a.getAnOperand() = this and
+      not this.getType() instanceof TypeString and
+      a.getAnOperand().getType() instanceof TypeString
+    )
   }
 
   override Type getConversionTarget() { result instanceof TypeString }
diff --git a/java/ql/lib/semmle/code/java/Statement.qll b/java/ql/lib/semmle/code/java/Statement.qll
index a4872a32c914..2aea8b006ae1 100644
--- a/java/ql/lib/semmle/code/java/Statement.qll
+++ b/java/ql/lib/semmle/code/java/Statement.qll
@@ -291,7 +291,7 @@ class TryStmt extends Stmt, @trystmt {
   CatchClause getACatchClause() { result.getParent() = this }
 
   /**
-   * Gets the `catch` clause at the specified (zero-based) position
+   * Gets the `catch` clause at the specified (zero-based) position `index`
    * in this `try` statement.
    */
   CatchClause getCatchClause(int index) {
@@ -305,7 +305,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource variable declaration, if any. */
   LocalVariableDeclStmt getAResourceDecl() { result.getParent() = this and result.getIndex() <= -3 }
 
-  /** Gets the resource variable declaration at the specified position in this `try` statement. */
+  /** Gets the resource variable declaration at the specified position `index` in this `try` statement. */
   LocalVariableDeclStmt getResourceDecl(int index) {
     result = this.getAResourceDecl() and
     index = -3 - result.getIndex()
@@ -314,7 +314,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource expression, if any. */
   VarAccess getAResourceExpr() { result.getParent() = this and result.getIndex() <= -3 }
 
-  /** Gets the resource expression at the specified position in this `try` statement. */
+  /** Gets the resource expression at the specified position `index` in this `try` statement. */
   VarAccess getResourceExpr(int index) {
     result = this.getAResourceExpr() and
     index = -3 - result.getIndex()
@@ -323,7 +323,7 @@ class TryStmt extends Stmt, @trystmt {
   /** Gets a resource in this `try` statement, if any. */
   ExprParent getAResource() { result = this.getAResourceDecl() or result = this.getAResourceExpr() }
 
-  /** Gets the resource at the specified position in this `try` statement. */
+  /** Gets the resource at the specified position `index` in this `try` statement. */
   ExprParent getResource(int index) {
     result = this.getResourceDecl(index) or result = this.getResourceExpr(index)
   }
diff --git a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
index e974f711ec45..1657a81816f8 100644
--- a/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/BasicBlocks.qll
@@ -98,6 +98,16 @@ class BasicBlock extends BbImpl::BasicBlock {
   /** Gets an immediate successor of this basic block of a given type, if any. */
   BasicBlock getASuccessor(Input::SuccessorType t) { result = super.getASuccessor(t) }
 
+  BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+  BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+  predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
+
+  predicate strictlyPostDominates(BasicBlock bb) { super.strictlyPostDominates(bb) }
+
+  predicate postDominates(BasicBlock bb) { super.postDominates(bb) }
+
   /**
    * DEPRECATED: Use `getASuccessor` instead.
    *
@@ -145,3 +155,17 @@ class BasicBlock extends BbImpl::BasicBlock {
 class ExitBlock extends BasicBlock {
   ExitBlock() { this.getLastNode() instanceof ControlFlow::ExitNode }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = BbImpl::ControlFlowNode;
+
+  class SuccessorType = BbImpl::SuccessorType;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock extends BasicBlock instanceof BbImpl::EntryBasicBlock { }
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) { BbImpl::dominatingEdge(bb1, bb2) }
+}
diff --git a/java/ql/lib/semmle/code/java/controlflow/Guards.qll b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
index 778ebe6e8789..041050e23966 100644
--- a/java/ql/lib/semmle/code/java/controlflow/Guards.qll
+++ b/java/ql/lib/semmle/code/java/controlflow/Guards.qll
@@ -139,19 +139,17 @@ private predicate isNonFallThroughPredecessor(SwitchCase sc, ControlFlowNode pre
   )
 }
 
-private module GuardsInput implements SharedGuards::InputSig<Location> {
-  private import java as J
-  private import semmle.code.java.dataflow.NullGuards as NullGuards
+private module SuccessorTypes implements SharedGuards::SuccessorTypesSig<SuccessorType> {
   import SuccessorType
+}
 
-  class ControlFlowNode = J::ControlFlowNode;
+private module GuardsInput implements SharedGuards::InputSig<Location, ControlFlowNode, BasicBlock> {
+  private import java as J
+  private import semmle.code.java.dataflow.internal.BaseSSA
+  private import semmle.code.java.dataflow.NullGuards as NullGuards
 
   class NormalExitNode = ControlFlow::NormalExitNode;
 
-  class BasicBlock = J::BasicBlock;
-
-  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) { J::dominatingEdge(bb1, bb2) }
-
   class AstNode = ExprParent;
 
   class Expr = J::Expr;
@@ -216,6 +214,12 @@ private module GuardsInput implements SharedGuards::InputSig<Location> {
         f.isFinal() and
         f.getInitializer() = NullGuards::baseNotNullExpr()
       )
+      or
+      exists(CatchClause cc, LocalVariableDeclExpr decl, BaseSsaUpdate v |
+        decl = cc.getVariable() and
+        decl = v.getDefiningExpr() and
+        this = v.getAUse()
+      )
     }
   }
 
@@ -375,7 +379,7 @@ private module GuardsInput implements SharedGuards::InputSig<Location> {
   }
 }
 
-private module GuardsImpl = SharedGuards::Make<Location, GuardsInput>;
+private module GuardsImpl = SharedGuards::Make<Location, Cfg, SuccessorTypes, GuardsInput>;
 
 private module LogicInputCommon {
   private import semmle.code.java.dataflow.NullGuards as NullGuards
diff --git a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
index 02f228d17dbe..756c5d1ae9f7 100644
--- a/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/Nullness.qll
@@ -653,7 +653,7 @@ private Expr trackingVarGuard(
       result = integerGuard(trackvar.getAnAccess(), branch, k, isA)
       or
       exists(int k2 |
-        result = integerGuard(trackvar.getAnAccess(), branch.booleanNot(), k2, true) and
+        result = integerGuard(trackvar.getAnAccess(), branch, k2, true) and
         isA = false and
         k2 != k
       )
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 5c0fbb88d664..e50581c7e14c 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/BaseSSA.qll
@@ -157,17 +157,7 @@ private module BaseSsaImpl {
 
 private import BaseSsaImpl
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import java as J
-
-  class BasicBlock = J::BasicBlock;
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = BaseSsaSourceVariable;
 
   /**
@@ -199,7 +189,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-private module Impl = SsaImplCommon::Make<Location, SsaInput>;
+private module Impl = SsaImplCommon::Make<Location, Cfg, SsaInput>;
 
 private import Cached
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll b/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
index f93139592269..5af246424772 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/ContainerFlow.qll
@@ -470,7 +470,8 @@ private predicate enhancedForStmtStep(Node node1, Node node2, Type containerType
 }
 
 /**
- * Holds if the step from `node1` to `node2` reads a value from an array.
+ * Holds if the step from `node1` to `node2` reads a value from an array, where
+ * the elements are of type `elemType`.
  * This covers ordinary array reads as well as array iteration through enhanced
  * `for` statements.
  */
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
index 8b9087ecbdc5..1721569e45a9 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowPrivate.qll
@@ -69,28 +69,10 @@ private predicate closureFlowStep(Expr e1, Expr e2) {
   )
 }
 
-private module CaptureInput implements VariableCapture::InputSig<Location> {
+private module CaptureInput implements VariableCapture::InputSig<Location, BasicBlock> {
   private import java as J
 
-  class BasicBlock instanceof J::BasicBlock {
-    string toString() { result = super.toString() }
-
-    ControlFlowNode getNode(int i) { result = super.getNode(i) }
-
-    int length() { result = super.length() }
-
-    Callable getEnclosingCallable() { result = super.getEnclosingCallable() }
-
-    Location getLocation() { result = super.getLocation() }
-  }
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-    result.(J::BasicBlock).immediatelyDominates(bb)
-  }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(J::BasicBlock).getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getEnclosingCallable() }
 
   //TODO: support capture of `this` in lambdas
   class CapturedVariable instanceof LocalScopeVariable {
@@ -165,7 +147,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class CapturedParameter = CaptureInput::CapturedParameter;
 
-module CaptureFlow = VariableCapture::Flow<Location, CaptureInput>;
+module CaptureFlow = VariableCapture::Flow<Location, Cfg, CaptureInput>;
 
 private CaptureFlow::ClosureNode asClosureNode(Node n) {
   result = n.(CaptureNode).getSynthesizedCaptureNode()
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 ab2f7f89cb46..4b436edc6aa6 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/DataFlowUtil.qll
@@ -263,8 +263,8 @@ class Content extends TContent {
 
   /**
    * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
+   * The location spans column `sc` of line `sl` to
+   * column `ec` of line `el` in file `path`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
@@ -362,8 +362,8 @@ class ContentSet instanceof Content {
 
   /**
    * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
+   * The location spans column `sc` of line `sl` to
+   * column `ec` of line `el` in file `path`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
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 51da69e9d64a..dc2cb7e7d00d 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/SsaImpl.qll
@@ -166,17 +166,7 @@ private predicate uncertainVariableUpdate(TrackedVar v, ControlFlowNode n, Basic
   uncertainVariableUpdate(v.getQualifier(), n, b, i)
 }
 
-private module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import java as J
-
-  class BasicBlock = J::BasicBlock;
-
-  class ControlFlowNode = J::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result.immediatelyDominates(bb) }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = SsaSourceVariable;
 
   /**
@@ -218,7 +208,7 @@ private module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, Cfg, SsaInput> as Impl
 
 final class Definition = Impl::Definition;
 
diff --git a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
index 8789661af7d2..6363b8f7ed35 100644
--- a/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
+++ b/java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisSpecific.qll
@@ -204,7 +204,7 @@ private module Impl {
   /** Gets the character value of expression `e`. */
   string getCharValue(Expr e) { result = e.(CharacterLiteral).getValue() }
 
-  /** Gets the constant `float` value of non-`ConstantIntegerExpr` expressions. */
+  /** Gets the constant `float` value of non-`ConstantIntegerExpr` expression `e`. */
   float getNonIntegerValue(Expr e) {
     result = e.(LongLiteral).getValue().toFloat() or
     result = e.(FloatLiteral).getValue().toFloat() or
@@ -256,12 +256,12 @@ private module Impl {
     exists(EnhancedForStmt for | def = for.getVariable())
   }
 
-  /** Returns the operand of the operation if `def` is a decrement. */
+  /** Returns the operand of the operation if `e` is a decrement. */
   Expr getDecrementOperand(Element e) {
     result = e.(PostDecExpr).getExpr() or result = e.(PreDecExpr).getExpr()
   }
 
-  /** Returns the operand of the operation if `def` is an increment. */
+  /** Returns the operand of the operation if `e` is an increment. */
   Expr getIncrementOperand(Element e) {
     result = e.(PostIncExpr).getExpr() or result = e.(PreIncExpr).getExpr()
   }
diff --git a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
index 1a8d987a38e4..a8559060d306 100644
--- a/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/Mockito.qll
@@ -223,10 +223,10 @@ class MockitoInjectedField extends MockitoAnnotatedField {
         // If there is no initializer for this field, and there is a most mockable constructor,
         // then we are doing a parameterized injection of mocks into a most mockable constructor.
         result = mockInjectedClass.getAMostMockableConstructor()
-      else
-        if this.usingPropertyInjection()
-        then
-          // We will call the no-arg constructor if the field wasn't initialized.
+      else (
+        this.usingPropertyInjection() and
+        // We will call the no-arg constructor if the field wasn't initialized.
+        (
           not exists(this.getInitializer()) and
           result = mockInjectedClass.getNoArgsConstructor()
           or
@@ -241,9 +241,8 @@ class MockitoInjectedField extends MockitoAnnotatedField {
             // once, but we instead assume that there are sufficient mocks to go around.
             mockedField.getType().(RefType).getAnAncestor() = result.getParameterType(0)
           )
-        else
-          // There's no instance, and no no-arg constructor we can call, so injection fails.
-          none()
+        )
+      )
     )
   }
 
@@ -253,18 +252,16 @@ class MockitoInjectedField extends MockitoAnnotatedField {
    * Field injection only occurs if property injection and not constructor injection is used.
    */
   Field getASetField() {
-    if this.usingPropertyInjection()
-    then
-      result = this.getMockInjectedClass().getASetField() and
-      exists(MockitoMockedField mockedField |
-        mockedField.getDeclaringType() = this.getDeclaringType() and
-        mockedField.isValid()
-      |
-        // We make a simplifying assumption here - in theory, each mock can only be injected
-        // once, but we instead assume that there are sufficient mocks to go around.
-        mockedField.getType().(RefType).getAnAncestor() = result.getType()
-      )
-    else none()
+    this.usingPropertyInjection() and
+    result = this.getMockInjectedClass().getASetField() and
+    exists(MockitoMockedField mockedField |
+      mockedField.getDeclaringType() = this.getDeclaringType() and
+      mockedField.isValid()
+    |
+      // We make a simplifying assumption here - in theory, each mock can only be injected
+      // once, but we instead assume that there are sufficient mocks to go around.
+      mockedField.getType().(RefType).getAnAncestor() = result.getType()
+    )
   }
 }
 
diff --git a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
index 2b003b3c94e7..d59976c0c6c8 100644
--- a/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
+++ b/java/ql/lib/semmle/code/java/frameworks/javaee/ejb/EJB.qll
@@ -35,14 +35,14 @@ class SessionEjb extends EJB {
     // Either the EJB does not declare any business interfaces explicitly
     // and implements a single interface candidate,
     // which is then considered to be the business interface...
-    count(this.getAnExplicitBusinessInterface()) = 0 and
+    not exists(this.getAnExplicitBusinessInterface()) and
     count(this.getAnImplementedBusinessInterfaceCandidate()) = 1 and
     result = this.getAnImplementedBusinessInterfaceCandidate()
     or
     // ...or each business interface needs to be declared explicitly.
     (
       count(this.getAnImplementedBusinessInterfaceCandidate()) != 1 or
-      count(this.getAnExplicitBusinessInterface()) != 0
+      exists(this.getAnExplicitBusinessInterface())
     ) and
     result = this.getAnExplicitBusinessInterface()
   }
diff --git a/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll b/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
index 98acdbc1c556..898673981483 100644
--- a/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/CleartextStorageAndroidFilesystemQuery.qll
@@ -55,7 +55,7 @@ private predicate isVarargs(Argument arg, DataFlow::ImplicitVarargsArray varargs
   arg.isVararg() and arg.getCall() = varargs.getCall()
 }
 
-/** Holds if `store` closes `file`. */
+/** Holds if `closeCall` closes `file`. */
 private predicate closesFile(DataFlow::Node file, Call closeCall) {
   closeCall.getCallee() instanceof CloseFileMethod and
   if closeCall.getCallee().isStatic()
diff --git a/java/ql/lib/semmle/code/java/security/FileWritable.qll b/java/ql/lib/semmle/code/java/security/FileWritable.qll
index d1833bf64d4d..a5efad31bcb1 100644
--- a/java/ql/lib/semmle/code/java/security/FileWritable.qll
+++ b/java/ql/lib/semmle/code/java/security/FileWritable.qll
@@ -89,7 +89,7 @@ private VarAccess getFileForPathConversion(Expr pathExpr) {
 }
 
 /**
- * Holds if `fileAccess` is used in the `setWorldWritableExpr` to set the file to be world writable.
+ * Holds if `fileAccess` is used in the `setWorldWritable` to set the file to be world writable.
  */
 private predicate fileSetWorldWritable(VarAccess fileAccess, Expr setWorldWritable) {
   // Calls to `File.setWritable(.., false)`.
diff --git a/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll
new file mode 100644
index 000000000000..163cd46d5d86
--- /dev/null
+++ b/java/ql/lib/semmle/code/java/security/SpringBootActuatorsConfigQuery.qll
@@ -0,0 +1,128 @@
+/** Provides classes and predicates to reason about Spring Boot actuators exposed in configuration files. */
+overlay[local?]
+module;
+
+import java
+private import semmle.code.configfiles.ConfigFiles
+private import semmle.code.xml.MavenPom
+
+/** The parent node of the `org.springframework.boot` group. */
+private class SpringBootParent extends Parent {
+  SpringBootParent() { this.getGroup().getValue() = "org.springframework.boot" }
+}
+
+/** A `Pom` with a Spring Boot parent node. */
+private class SpringBootPom extends Pom {
+  SpringBootPom() { this.getParentElement() instanceof SpringBootParent }
+
+  /** Holds if the Spring Boot Security module is used in the project. */
+  predicate isSpringBootSecurityUsed() {
+    this.getADependency().getArtifact().getValue() = "spring-boot-starter-security"
+  }
+}
+
+/** A dependency with artifactId `spring-boot-starter-actuator`. */
+class SpringBootStarterActuatorDependency extends Dependency {
+  SpringBootStarterActuatorDependency() {
+    this.getArtifact().getValue() = "spring-boot-starter-actuator"
+  }
+}
+
+/** The Spring Boot configuration property `management.security.enabled`. */
+private class ManagementSecurityEnabledProperty extends JavaProperty {
+  ManagementSecurityEnabledProperty() {
+    this.getNameElement().getName() = "management.security.enabled"
+  }
+
+  /** Gets the whitespace-trimmed value of this property. */
+  string getValue() { result = this.getValueElement().getValue().trim() }
+
+  /** Holds if `management.security.enabled` is set to `false`. */
+  predicate hasSecurityDisabled() { this.getValue() = "false" }
+}
+
+/**
+ * The Spring Boot configuration property `management.endpoints.web.exposure.include`
+ * or `management.endpoints.web.expose`.
+ */
+private class ManagementEndpointsExposeProperty extends JavaProperty {
+  ManagementEndpointsExposeProperty() {
+    this.getNameElement().getName() = "management.endpoints.web." + ["exposure.include", "expose"]
+  }
+
+  /** Gets the whitespace-trimmed value of this property. */
+  string getValue() { result = this.getValueElement().getValue().trim() }
+}
+
+private newtype TOption =
+  TNone() or
+  TSome(JavaProperty jp)
+
+/**
+ * An option type that is either a singleton `None` or a `Some` wrapping
+ * the `JavaProperty` type.
+ */
+class JavaPropertyOption extends TOption {
+  /** Gets a textual representation of this element. */
+  string toString() {
+    this = TNone() and result = "(none)"
+    or
+    result = this.asSome().toString()
+  }
+
+  /** Gets the location of this element. */
+  Location getLocation() { result = this.asSome().getLocation() }
+
+  /** Gets the wrapped element, if any. */
+  JavaProperty asSome() { this = TSome(result) }
+
+  /** Holds if this option is the singleton `None`. */
+  predicate isNone() { this = TNone() }
+}
+
+/**
+ * Holds if `JavaPropertyOption` jpOption of a repository using `SpringBootStarterActuatorDependency`
+ * d exposes sensitive Spring Boot Actuator endpoints.
+ */
+predicate exposesSensitiveEndpoint(
+  SpringBootStarterActuatorDependency d, JavaPropertyOption jpOption
+) {
+  exists(PropertiesFile propFile, SpringBootPom pom |
+    d = pom.getADependency() and
+    not pom.isSpringBootSecurityUsed() and
+    propFile
+        .getParentContainer()
+        .getAbsolutePath()
+        .matches(pom.getFile().getParentContainer().getAbsolutePath() + "%") and // in the same sub-directory
+    exists(string springBootVersion |
+      springBootVersion = pom.getParentElement().getVersionString()
+    |
+      springBootVersion.regexpMatch("1\\.[0-4].*") and // version 1.0, 1.1, ..., 1.4
+      not exists(ManagementSecurityEnabledProperty ep | ep.getFile() = propFile) and
+      jpOption.isNone()
+      or
+      springBootVersion.regexpMatch("1\\.[0-5].*") and // version 1.0, 1.1, ..., 1.5
+      exists(ManagementSecurityEnabledProperty ep |
+        ep.hasSecurityDisabled() and ep.getFile() = propFile and ep = jpOption.asSome()
+      )
+      or
+      springBootVersion.matches(["2.%", "3.%"]) and //version 2.x and 3.x
+      exists(ManagementEndpointsExposeProperty ep |
+        ep.getFile() = propFile and
+        ep = jpOption.asSome() and
+        (
+          // all endpoints are exposed
+          ep.getValue() = "*"
+          or
+          // version 2.x: exposes health and info only by default
+          springBootVersion.matches("2.%") and
+          not ep.getValue() = ["health", "info"]
+          or
+          // version 3.x: exposes health only by default
+          springBootVersion.matches("3.%") and
+          not ep.getValue() = "health"
+        )
+      )
+    )
+  )
+}
diff --git a/java/ql/lib/semmle/code/java/security/TempDirUtils.qll b/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
index 3d1623fa334c..21e289ef1ade 100644
--- a/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
+++ b/java/ql/lib/semmle/code/java/security/TempDirUtils.qll
@@ -26,7 +26,8 @@ class MethodFileCreateTempFile extends Method {
 }
 
 /**
- * Holds if `expDest` is some constructor call `new java.io.File(expSource)`, where the specific `File` constructor being used has `paramCount` parameters.
+ * Holds if `expSource` is an argument to a constructor call `exprDest` (constructor from `java.io.File`), where
+ * the specific `File` constructor being used has `paramCount` parameters.
  */
 predicate isFileConstructorArgument(Expr expSource, Expr exprDest, int paramCount) {
   exists(ConstructorCall construtorCall |
diff --git a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
index ce0f649eff35..f5968898adcf 100644
--- a/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
+++ b/java/ql/lib/semmle/code/java/security/UnsafeDeserializationQuery.qll
@@ -552,7 +552,7 @@ private DataFlow::Node getASafelyConfiguredParser() {
 }
 
 /**
- * Holds if `parseMethodQualifierExpr` is a `jodd.json.JsonParser` instance that is configured unsafely
+ * Holds if `parserExpr` is a `jodd.json.JsonParser` instance that is configured unsafely
  * and which never appears to be configured safely.
  */
 private predicate joddJsonParserConfiguredUnsafely(Expr parserExpr) {
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index 81ce9022d918..ffd5648cddf5 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,19 @@
+## 1.7.0
+
+### New Queries
+
+* The query `java/insecure-spring-actuator-config` has been promoted from experimental to the main query pack as `java/spring-boot-exposed-actuators-config`. Its results will now appear by default. This query detects exposure of Spring Boot actuators through configuration files. It was originally submitted as an experimental query [by @luchua-bc](https://github.com/github/codeql/pull/5384).
+
+### Query Metadata Changes
+
+* The tag `maintainability` has been removed from `java/run-finalizers-on-exit` and the tags `quality`, `correctness`, and `performance` have been added.
+* The tag `maintainability` has been removed from `java/garbage-collection` and the tags `quality` and `correctness` have been added.
+
+### Minor Analysis Improvements
+
+* Fixed a bug that was causing false negatives in rare cases in the query `java/dereferenced-value-may-be-null`.
+* Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/java/ql/src/Language Abuse/EmptyStatement.java b/java/ql/src/Language Abuse/EmptyStatement.java
deleted file mode 100644
index 4f9b462a38fa..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.java	
+++ /dev/null
@@ -1,8 +0,0 @@
-public class Cart {
-	// AVOID: Empty statement
-	List<Item> items = new ArrayList<Cart>();;
-	public void applyDiscount(float discount) {
-		// AVOID: Empty statement as loop body
-		for (int i = 0; i < items.size(); items.get(i++).applyDiscount(discount));
-	}
-}
\ No newline at end of file
diff --git a/java/ql/src/Language Abuse/EmptyStatement.qhelp b/java/ql/src/Language Abuse/EmptyStatement.qhelp
deleted file mode 100644
index 700bd488dfce..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.qhelp	
+++ /dev/null
@@ -1,39 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-
-<overview>
-<p>An <em>empty statement</em> is a single semicolon <code>;</code> that does not
-terminate another statement. Such a statement hinders readability and has no effect on its own.</p>
-
-</overview>
-<recommendation>
-
-<p>Avoid empty statements. If a loop is intended to have an empty body, it is better
-to mark that fact explicitly by using a pair of braces <code>{}</code> containing an explanatory comment
-for the body, rather than a single semicolon.</p>
-
-</recommendation>
-<example>
-
-<p>In the following example, there is an empty statement on line 3, where an additional semicolon is
-used. On line 6, the <code>for</code> statement has an empty body because the condition is
-immediately followed by a semicolon. In this case, it is better to include a pair of braces <code>{}</code> containing
-an explanatory comment for the body instead.
-
-</p><sample src="EmptyStatement.java" />
-
-</example>
-<references>
-
-
-<li>
-Help - Eclipse Platform:
-<a href="https://help.eclipse.org/2020-12/advanced/content.jsp?topic=/org.eclipse.jdt.doc.user/reference/preferences/java/compiler/ref-preferences-errors-warnings.htm">Java Compiler Errors/Warnings Preferences</a>.
-</li>
-
-
-</references>
-</qhelp>
diff --git a/java/ql/src/Language Abuse/EmptyStatement.ql b/java/ql/src/Language Abuse/EmptyStatement.ql
deleted file mode 100644
index 36f61b862ac9..000000000000
--- a/java/ql/src/Language Abuse/EmptyStatement.ql	
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * @name Empty statement
- * @description An empty statement hinders readability.
- * @kind problem
- * @problem.severity recommendation
- * @precision low
- * @id java/empty-statement
- * @tags maintainability
- *       useless-code
- */
-
-import java
-
-from EmptyStmt empty, string action
-where
-  if exists(LoopStmt l | l.getBody() = empty)
-  then action = "turned into '{}'"
-  else action = "deleted"
-select empty, "This empty statement should be " + action + "."
diff --git a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql
index f8b1cd85552a..bb370bead3b5 100644
--- a/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql	
+++ b/java/ql/src/Likely Bugs/Comparison/HashedButNoHash.ql	
@@ -14,7 +14,7 @@
 import java
 import Equality
 
-/** A class that defines an `equals` method but no `hashCode` method. */
+/** Holds if `c` defines an `equals` method but no `hashCode` method. */
 predicate eqNoHash(Class c) {
   exists(Method m | m = c.getAMethod() |
     m instanceof EqualsMethod and
diff --git a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql
index 89dbedd02532..48f547575eea 100644
--- a/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql	
+++ b/java/ql/src/Likely Bugs/Concurrency/NotifyWithoutSynch.ql	
@@ -78,7 +78,7 @@ private predicate synchronizedThisAccess(MethodCall ma, Type thisType) {
 
 /**
  * Auxiliary predicate for `unsynchronizedVarAccess`. Holds if
- * there is an enclosing `synchronized` statement on the variable.
+ * there is an enclosing `synchronized` statement on the variable access `x`.
  */
 predicate synchronizedVarAccess(VarAccess x) {
   exists(SynchronizedStmt s, VarAccess y |
diff --git a/java/ql/src/Likely Bugs/Termination/SpinOnField.ql b/java/ql/src/Likely Bugs/Termination/SpinOnField.ql
index 8675bbd418b0..d1a7d49db55c 100644
--- a/java/ql/src/Likely Bugs/Termination/SpinOnField.ql	
+++ b/java/ql/src/Likely Bugs/Termination/SpinOnField.ql	
@@ -33,8 +33,8 @@ class Empty extends Stmt {
 class EmptyLoop extends Stmt {
   EmptyLoop() {
     exists(ForStmt stmt | stmt = this |
-      count(stmt.getAnInit()) = 0 and
-      count(stmt.getAnUpdate()) = 0 and
+      not exists(stmt.getAnInit()) and
+      not exists(stmt.getAnUpdate()) and
       stmt.getStmt() instanceof Empty
     )
     or
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp
new file mode 100644
index 000000000000..d3e79e88ed75
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qhelp
@@ -0,0 +1,39 @@
+<!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 through configuration files 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. If you need to expose actuator endpoints, use Spring
+    Security, which secures actuators by default, or define a custom security configuration.
+    </p>
+  </recommendation>
+
+  <example>
+    <p>The following examples show <code>application.properties</code> configurations that expose sensitive
+    actuator endpoints.</p>
+    <sample src="application_bad.properties" />
+
+    <p>The below configurations ensure that sensitive actuator endpoints are not exposed.</p>
+    <sample src="application_good.properties" />
+
+    <p>To use Spring Security, which secures actuators by default, add the <code>spring-boot-starter-security</code>
+    dependency in your Maven <code>pom.xml</code> file.</p>
+    <sample src="pom_good.xml" />
+  </example>
+
+  <references>
+    <li>
+      Spring Boot Reference Documentation:
+      <a href="https://docs.spring.io/spring-boot/reference/actuator/endpoints.html">Endpoints</a>.
+    </li>
+    <li>
+      HackerOne Report:
+      <a href="https://hackerone.com/reports/862589">Spring Actuator endpoints publicly available, leading to account takeover</a>
+    </li>
+  </references>
+</qhelp>
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
new file mode 100644
index 000000000000..562298257a7d
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
@@ -0,0 +1,20 @@
+/**
+ * @name Exposed Spring Boot actuators in configuration file
+ * @description Exposing Spring Boot actuators through configuration files 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-config
+ * @tags security
+ *       external/cwe/cwe-200
+ */
+
+import java
+import semmle.code.xml.MavenPom
+import semmle.code.java.security.SpringBootActuatorsConfigQuery
+
+from SpringBootStarterActuatorDependency d, JavaPropertyOption jpOption
+where exposesSensitiveEndpoint(d, jpOption)
+select d, "Insecure Spring Boot actuator $@ exposes sensitive endpoints.", jpOption, "configuration"
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties
new file mode 100644
index 000000000000..ccf1cb678813
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_bad.properties
@@ -0,0 +1,10 @@
+# vulnerable configuration (Spring Boot 1.0 - 1.4): exposes endpoints by default
+
+# vulnerable configuration (Spring Boot 1.5): false value exposes endpoints
+management.security.enabled=false
+
+# vulnerable configuration (Spring Boot 2.x): exposes all endpoints
+management.endpoints.web.exposure.include=*
+
+# vulnerable configuration (Spring Boot 3.x): exposes all endpoints
+management.endpoints.web.exposure.include=*
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties
new file mode 100644
index 000000000000..1af2b7b0228a
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/application_good.properties
@@ -0,0 +1,11 @@
+# safe configuration (Spring Boot 1.0 - 1.4)
+management.security.enabled=true
+
+# safe configuration (Spring Boot 1.5+)
+management.security.enabled=true
+
+# safe configuration (Spring Boot 2.x): exposes health and info only by default
+management.endpoints.web.exposure.include=health,info
+
+# safe configuration (Spring Boot 3.x): exposes health only by default
+management.endpoints.web.exposure.include=health
diff --git a/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml
new file mode 100644
index 000000000000..32fad44591e5
--- /dev/null
+++ b/java/ql/src/Security/CWE/CWE-200/SpringBootActuatorsConfig/pom_good.xml
@@ -0,0 +1,12 @@
+...
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+
+        <!-- GOOD: Enable Spring Security -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+...
diff --git a/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md
new file mode 100644
index 000000000000..bcf10901549e
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.md	
@@ -0,0 +1,36 @@
+## Overview
+
+Accessing class members annotated with `@VisibleForTesting` from production code goes against the intention of the annotation and may indicate programmer error.
+
+The `@VisibleForTesting` annotation serves to increase visibility of methods, fields or classes for the purposes of testing. Accessing these annotated elements in production code (not test code) abuses the intention of the annotation.
+
+## Recommendation
+
+Only access methods, fields or classes annotated with `@VisibleForTesting` from test code. If the visibility of the methods, fields or classes should generally be relaxed, use Java language access modifiers.
+
+## Example
+
+```java
+public class Annotated {
+    @VisibleForTesting static int f() { return 42; }
+}
+
+/* src/test/java/Test.java */
+int i = Annotated.f(); // COMPLIANT
+
+/* src/main/Source.java */
+int i = Annotated.f(); // NON_COMPLIANT
+```
+
+## Implementation notes
+
+This rule alerts on any implementation of the annotation `VisibleForTesting`, regardless of where it is provided from.
+
+The rule also uses the following logic to determine what an abuse of the annotation is:
+
+  1. If a public or protected member/type is annotated with `@VisibleForTesting`, it's assumed that package-private access is enough for production code. Therefore the rule alerts when a public or protected member/type annotated with `@VisibleForTesting` is used outside of its declaring package.
+  2. If a package-private member/type is annotated with `@VisibleForTesting`, it's assumed that private access is enough for production code. Therefore the rule alerts when a package-private member/type annotated with `@VisibleForTesting` is used outside its declaring class.
+
+## References
+- Javadoc: [AssertJ VisibleForTesting](https://javadoc.io/doc/org.assertj/assertj-core/latest/org.assertj.core/org/assertj/core/util/VisibleForTesting.html).
+- Javadoc: [JetBrains VisibleForTesting](https://javadoc.io/doc/org.jetbrains/annotations/22.0.0/org/jetbrains/annotations/VisibleForTesting.html).
diff --git a/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
new file mode 100644
index 000000000000..c882d3f629bb
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql	
@@ -0,0 +1,112 @@
+/**
+ * @id java/visible-for-testing-abuse
+ * @name Use of VisibleForTesting in production code
+ * @description Accessing methods, fields or classes annotated with `@VisibleForTesting` from
+ *              production code goes against the intention of the annotation and may indicate
+ *              programmer error.
+ * @kind problem
+ * @precision high
+ * @problem.severity warning
+ * @tags quality
+ *       maintainability
+ *       readability
+ */
+
+import java
+
+/**
+ * Holds if a `Callable` is within the same type hierarchy as `RefType`
+ * (including through lambdas, inner classes, and outer classes).
+ */
+predicate isWithinType(Callable c, RefType t) {
+  // Either the callable is in the target type, or they share a common enclosing type
+  c.getDeclaringType().getEnclosingType*() = t.getEnclosingType*()
+}
+
+/**
+ * Holds if `e` is within the same package as `t`.
+ */
+predicate isWithinPackage(Expr e, RefType t) {
+  e.getCompilationUnit().getPackage() = t.getPackage()
+}
+
+/**
+ * Holds if a callable or any of its enclosing callables is annotated with @VisibleForTesting.
+ */
+predicate isWithinVisibleForTestingContext(Callable c) {
+  c.getAnAnnotation().getType().hasName("VisibleForTesting")
+  or
+  isWithinVisibleForTestingContext(c.getEnclosingCallable())
+}
+
+/**
+ * Holds if `e` is within a test method context, including lambda expressions
+ * within test methods and nested lambdas.
+ */
+private predicate isWithinTest(Expr e) {
+  e.getEnclosingCallable() instanceof LikelyTestMethod
+  or
+  exists(Method lambda, LambdaExpr lambdaExpr |
+    lambda = lambdaExpr.asMethod() and
+    lambda.getEnclosingCallable*() instanceof LikelyTestMethod and
+    e.getEnclosingCallable() = lambda
+  )
+}
+
+from Annotatable annotated, Expr e
+where
+  annotated.getAnAnnotation().getType().hasName("VisibleForTesting") and
+  (
+    // field access
+    e =
+      any(FieldAccess v |
+        v.getField() = annotated and
+        // depending on the visibility of the field, using the annotation to abuse the visibility may/may not be occurring
+        (
+          // if its package protected report when its used outside its class because it should have been private (class only permitted)
+          v.getField().isPackageProtected() and
+          not isWithinType(v.getEnclosingCallable(), v.getField().getDeclaringType())
+          or
+          // if public or protected report when its used outside its package because package protected should have been enough (package only permitted)
+          (v.getField().isPublic() or v.getField().isProtected()) and
+          not isWithinPackage(v, v.getField().getDeclaringType())
+        )
+      )
+    or
+    // method access
+    e =
+      any(MethodCall c |
+        c.getMethod() = annotated and
+        // depending on the visibility of the method, using the annotation to abuse the visibility may/may not be occurring
+        (
+          // if its package protected report when its used outside its class because it should have been private (class only permitted)
+          c.getMethod().isPackageProtected() and
+          not isWithinType(c.getEnclosingCallable(), c.getMethod().getDeclaringType())
+          or
+          // if public or protected report when its used outside its package because package protected should have been enough (package only permitted)
+          (c.getMethod().isPublic() or c.getMethod().isProtected()) and
+          not isWithinPackage(c, c.getMethod().getDeclaringType())
+        )
+      )
+    or
+    // Class instantiation - report if used outside appropriate scope
+    e =
+      any(ClassInstanceExpr c |
+        c.getConstructedType() = annotated and
+        (
+          c.getConstructedType().isPublic() and not isWithinPackage(c, c.getConstructedType())
+          or
+          c.getConstructedType().hasNoModifier() and
+          c.getConstructedType() instanceof NestedClass and
+          not isWithinType(c.getEnclosingCallable(), c.getConstructedType())
+        )
+      )
+  ) and
+  // not in a test where use is appropriate
+  not isWithinTest(e) and
+  // not when the accessing method or any enclosing method is @VisibleForTesting (test-to-test communication)
+  not isWithinVisibleForTestingContext(e.getEnclosingCallable()) and
+  // not when used in annotation contexts
+  not e.getParent*() instanceof Annotation
+select e, "Access of $@ annotated with VisibleForTesting found in production code.", annotated,
+  "element"
diff --git a/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll b/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll
index dc5b4eada8d9..c94a4fb58bf2 100644
--- a/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll	
+++ b/java/ql/src/Violations of Best Practice/Magic Constants/MagicConstants.qll	
@@ -105,7 +105,7 @@ private predicate valueOccurrenceCount(string value, int n, string context) {
   n > 20
 }
 
-private predicate occurenceCount(Literal lit, string value, int n, string context) {
+private predicate occurrenceCount(Literal lit, string value, int n, string context) {
   valueOccurrenceCount(value, n, context) and
   value = lit.getValue() and
   nonTrivialValue(_, lit, context)
@@ -119,7 +119,7 @@ private predicate check(Literal lit, string value, int n, string context, Compil
   // Check that the literal is nontrivial
   not trivial(lit) and
   // Check that it is repeated a number of times
-  occurenceCount(lit, value, n, context) and
+  occurrenceCount(lit, value, n, context) and
   n > 20 and
   f = lit.getCompilationUnit()
 }
diff --git a/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql b/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql
index ca002fc654a6..ed492e5b6a1e 100644
--- a/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql	
+++ b/java/ql/src/Violations of Best Practice/Naming Conventions/ConfusingOverloading.ql	
@@ -48,7 +48,7 @@ private predicate overloadedMethodsMostSpecific(Method n, Method m) {
 private predicate whitelist(string name) { name = "visit" }
 
 /**
- * Method `m` has name `name`, number of parameters `numParams`
+ * Method `m` has name `name`, number of parameters `numParam`
  * and is declared in `t` or inherited from a supertype of `t`.
  */
 pragma[nomagic]
diff --git a/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md
new file mode 100644
index 000000000000..d932df251163
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.md	
@@ -0,0 +1,52 @@
+## Overview
+
+Mocking methods of a class is necessary for unit tests to run without overhead caused by expensive I/O operations. However, when a unit test ends up mocking all public methods of a class, it may indicate that the test is too complicated, possibly because it is trying to test multiple things at once. Such extensive mocking is likely a signal that the scope of the unit test is reaching beyond a single unit of functionality.
+
+## Recommendation
+
+It is best to contain the scope of a single unit test to a single unit of functionality. For example, a unit test may aim to test a series of data-transforming functions that depend on an ORM class. Even though the functions may be semantically related with one another, it is better to create a unit test for each function.
+
+## Example
+
+The following example mocks all methods of an ORM class named `EmployeeRecord`, and tests four functions against them. Since the scope of the unit test harbors all four of them, all of the methods provided by the class are mocked.
+
+```java
+public class EmployeeRecord {
+  public int add(Employee employee) { ... }
+
+  public Employee get(String name) { ... }
+
+  public int update(Employee employee, String newName) { ... }
+
+  public int delete(Employee employee) { ... }
+}
+
+public class TestORM {
+  @Test
+  public void nonCompliant() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);  // NON_COMPLIANT: Mocked class has all of its public methods used in the test
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0);                   // Mocked EmployeeRecord.add
+    when(employeeRecordMock.get("John Doe")).thenReturn(sampleEmployee);          // Mocked EmployeeRecord.get
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0);    // Mocked EmployeeRecord.update
+    when(employeeRecordMock.delete(sampleEmployee)).thenReturn(0);                // Mocked EmployeeRecord.delete
+  }
+
+  @Test
+  public void compliant() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0);                // Mocked EmployeeRecord.add
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+  }
+
+}
+```
+
+## Implementation Notes
+
+JUnit provides two different ways of mocking a method call: `when(mockedObject.methodToMock(...)).thenReturn(...)` and `doReturn(...).when(mockedObject).methodToMock(...)`. Both forms are taken into account by the query.
+
+## References
+
+- Baeldung: [Best Practices for Unit Testing in Java](https://www.baeldung.com/java-unit-testing-best-practices).
diff --git a/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
new file mode 100644
index 000000000000..a566d6162d21
--- /dev/null
+++ b/java/ql/src/Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql	
@@ -0,0 +1,80 @@
+/**
+ * @id java/excessive-public-method-mocking
+ * @previous-id java/mocking-all-non-private-methods-means-unit-test-is-too-big
+ * @name Mocking all public methods of a class may indicate the unit test is testing too much
+ * @description Mocking all public methods provided by a class might indicate the unit test
+ *              aims to test too many things.
+ * @kind problem
+ * @precision high
+ * @problem.severity recommendation
+ * @tags quality
+ *       maintainability
+ *       readability
+ */
+
+import java
+
+/**
+ * A call to Mockito's `mock` method.
+ */
+class MockitoMockCall extends MethodCall {
+  MockitoMockCall() { this.getMethod().hasQualifiedName("org.mockito", "Mockito", "mock") }
+
+  /**
+   * Gets the type that this call intends to mock. For example:
+   * ```java
+   * EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);
+   * ```
+   * This predicate gets the class `EmployeeRecord` in the above example.
+   */
+  Type getMockedType() { result = this.getAnArgument().(TypeLiteral).getReferencedType() }
+}
+
+/**
+ * A method call that mocks a target method in a JUnit test. For example:
+ * ```java
+ * EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class);
+ * when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+ * doReturn(0).when(employeeRecordMock).add(sampleEmployee);   // Mocked EmployeeRecord.add
+ * ```
+ * This class captures the call to `add` which mocks the equivalent method of the class `EmployeeRecord`.
+ */
+class MockitoMockingMethodCall extends MethodCall {
+  MockitoMockCall mockCall;
+
+  MockitoMockingMethodCall() {
+    /* 1. The qualifier originates from the mock call. */
+    this.getQualifier().getControlFlowNode().getAPredecessor+() = mockCall.getControlFlowNode() and
+    /* 2. The mocked method can be found in the class being mocked with the mock call. */
+    mockCall.getMockedType().(ClassOrInterface).getAMethod() = this.getMethod()
+  }
+
+  /**
+   * Gets the call to Mockito's `mock` from which the qualifier, the mocked object, originates.
+   */
+  MockitoMockCall getMockitoMockCall() { result = mockCall }
+}
+
+/*
+ * The following from-where-select embodies this pseudocode:
+ * - Find a JUnit4TestMethod which:
+ *   - for a class that it mocks with a call to `mock`,
+ *     - for all methods that the class has, there is a method that this test method mocks.
+ */
+
+from JUnit4TestMethod testMethod, ClassOrInterface mockedClassOrInterface
+where
+  exists(MockitoMockCall mockCall |
+    mockCall.getEnclosingCallable() = testMethod and
+    mockedClassOrInterface = mockCall.getMockedType() and
+    // Only flag classes with multiple public methods (2 or more)
+    strictcount(Method m | m = mockedClassOrInterface.getAMethod() and m.isPublic()) > 1 and
+    forex(Method method | method = mockedClassOrInterface.getAMethod() and method.isPublic() |
+      exists(MockitoMockingMethodCall mockedMethod |
+        mockedMethod.getMockitoMockCall() = mockCall and
+        mockedMethod.getMethod() = method
+      )
+    )
+  )
+select testMethod, "This test method mocks all public methods of a $@.", mockedClassOrInterface,
+  "class or an interface"
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql
index c2ffe45b5209..568be1805e66 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToRunFinalizersOnExit.ql	
@@ -7,8 +7,11 @@
  * @problem.severity error
  * @precision medium
  * @id java/run-finalizers-on-exit
- * @tags reliability
- *       maintainability
+ * @previous-id java/do-not-use-finalizers
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       performance
  */
 
 import java
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java
index da7277aa25c3..50e0fb1cbda0 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.java	
@@ -4,7 +4,7 @@ boolean write(String[] s) {
         try {
             output.write(s.getBytes());
         } catch (IOException e) {
-            System.exit(1);
+            System.exit(1); // BAD: Should handle or propagate error instead of exiting
         }
         return true;
     }
@@ -16,9 +16,30 @@ public void run() {
         // ...
         // Perform tasks ...
         // ...
-        System.exit(0);
+        System.exit(0); // BAD: Should return status or throw exception
     }
     public static void main(String[] args) {
-        new Action(args).run();
+        new Action().run();
     }
-}
\ No newline at end of file
+}
+
+// Good example: Proper error handling
+class BetterAction {
+    public int run() throws Exception {
+        // ...
+        // Perform tasks ...
+        // ...
+        return 0; // Return status instead of calling System.exit
+    }
+    
+    public static void main(String[] args) {
+        try {
+            BetterAction action = new BetterAction();
+            int exitCode = action.run();
+            System.exit(exitCode); // GOOD: Exit from main method
+        } catch (Exception e) {
+            System.err.println("Error: " + e.getMessage());
+            System.exit(1); // GOOD: Exit from main method on error
+        }
+    }
+}
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp
index e4d4fa7a7f0e..6992a734607c 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.qhelp	
@@ -13,17 +13,20 @@ program state from being written to disk consistently.</p>
 
 <p>It is sometimes considered acceptable to call <code>System.exit</code>
 from a program's <code>main</code> method in order to indicate the overall exit status
-of the program. Such calls are an exception to this rule.</p>
+of the program. The <code>main</code> method should be the primary place
+where exit conditions are handled, as it represents the natural termination point
+of the application. Such calls are an exception to this rule.</p>
 
 </overview>
 <recommendation>
 
-<p>It is usually preferable to use a different mechanism for reporting
-failure conditions. Consider returning a special value (perhaps
-<code>null</code>) that users of the current method check for and
-recover from appropriately. Alternatively, throw a suitable exception, which 
-unwinds the stack and allows properly written code to clean up after itself,
-while leaving other threads undisturbed.</p>
+<p>Instead of calling <code>System.exit</code> from non-main methods, prefer to propagate
+errors upward to the <code>main</code> method where they can be handled appropriately.
+Consider returning a special value (perhaps <code>null</code>) that users of the current 
+method check for and recover from appropriately. Alternatively, throw a suitable exception, 
+which unwinds the stack and allows properly written code to clean up after itself,
+while leaving other threads undisturbed. The <code>main</code> method can then catch
+these exceptions and decide whether to exit the program and with what exit code.</p>
 
 </recommendation>
 <example>
@@ -38,12 +41,14 @@ upwards and be handled by a method that knows how to recover.</p>
 <p>Problem 2 is more subtle. In this example, there is just one entry point to
 the program (the <code>main</code> method), which constructs an
 <code>Action</code> and performs it. <code>Action.run</code> calls
-<code>System.exit</code> to indicate successful completion. Consider,
-however, how this code might be integrated in an application server that
-constructs <code>Action</code> instances and calls
+<code>System.exit</code> to indicate successful completion. Instead, the 
+<code>run</code> method should return a status code or throw an exception
+on failure, allowing the <code>main</code> method to decide whether to exit
+and with what exit code. Consider how this code might be integrated in an 
+application server that constructs <code>Action</code> instances and calls
 <code>run</code> on them without going through <code>main</code>.
 The fact that <code>run</code> terminates the JVM instead of returning its
-exit code as an integer makes that use-case impossible.</p>
+exit code makes that use-case impossible.</p>
   
 <sample src="CallsToSystemExit.java" />
 
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
index 93d7911694cf..52f82218c332 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql	
@@ -4,26 +4,80 @@
  *              reuse and prevent important cleanup steps from running.
  * @kind problem
  * @problem.severity warning
- * @precision low
+ * @precision medium
  * @id java/jvm-exit
- * @tags reliability
- *       maintainability
+ * @previous-id java/jvm-exit-prevents-cleanup-and-reuse
+ * @tags quality
+ *       reliability
+ *       correctness
  *       external/cwe/cwe-382
  */
 
 import java
 
-from Method m, MethodCall sysexitCall, Method sysexit, Class system
-where
-  sysexitCall = m.getACallSite(sysexit) and
-  (sysexit.hasName("exit") or sysexit.hasName("halt")) and
-  sysexit.getDeclaringType() = system and
-  (
-    system.hasQualifiedName("java.lang", "System") or
-    system.hasQualifiedName("java.lang", "Runtime")
-  ) and
-  m.fromSource() and
-  not m instanceof MainMethod
-select sysexitCall,
-  "Avoid calls to " + sysexit.getDeclaringType().getName() + "." + sysexit.getName() +
-    "() as this makes code harder to reuse."
+/**
+ * A `Method` which, when called, causes the JVM to exit or halt.
+ *
+ * Explicitly includes these methods from the java standard library:
+ *   - `java.lang.System.exit`
+ *   - `java.lang.Runtime.halt`
+ *   - `java.lang.Runtime.exit`
+ */
+class ExitOrHaltMethod extends Method {
+  ExitOrHaltMethod() {
+    exists(Class system | this.getDeclaringType() = system |
+      this.hasName("exit") and
+      system.hasQualifiedName("java.lang", ["System", "Runtime"])
+      or
+      this.hasName("halt") and
+      system.hasQualifiedName("java.lang", "Runtime")
+    )
+  }
+}
+
+/** A `MethodCall` to an `ExitOrHaltMethod`, which causes the JVM to exit abruptly. */
+class ExitOrHaltMethodCall extends MethodCall {
+  ExitOrHaltMethodCall() {
+    exists(ExitOrHaltMethod exitMethod | this.getMethod() = exitMethod |
+      exists(SourceMethodNotMainOrTest srcMethod | this = srcMethod.getACallSite(exitMethod))
+    )
+  }
+}
+
+/**
+ * An intentional `MethodCall` to a system or runtime "exit" method, such as for
+ * functions which exist for the purpose of exiting the program. Assumes that an exit method
+ * call within a method is intentional if the exit code is passed from a parameter of the
+ * enclosing method.
+ */
+class IntentionalExitMethodCall extends ExitOrHaltMethodCall {
+  IntentionalExitMethodCall() {
+    this.getMethod().hasName("exit") and
+    this.getAnArgument() = this.getEnclosingCallable().getAParameter().getAnAccess()
+  }
+}
+
+/**
+ * A `Method` that is defined in source code and is not a `MainMethod` or a `LikelyTestMethod`.
+ */
+class SourceMethodNotMainOrTest extends Method {
+  SourceMethodNotMainOrTest() {
+    this.fromSource() and
+    not this instanceof MainMethod and
+    not (
+      this.getEnclosingCallable*() instanceof LikelyTestMethod
+      or
+      this.getDeclaringType()
+          .getEnclosingType*()
+          .(LocalClassOrInterface)
+          .getLocalTypeDeclStmt()
+          .getEnclosingCallable() instanceof LikelyTestMethod
+    )
+  }
+}
+
+from ExitOrHaltMethodCall mc
+where not mc instanceof IntentionalExitMethodCall
+select mc,
+  "Avoid calls to " + mc.getMethod().getDeclaringType().getName() + "." + mc.getMethod().getName() +
+    "() as this prevents runtime cleanup and makes code harder to reuse."
diff --git a/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql b/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql
index 1067bdcb6dce..620177cc58c6 100644
--- a/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql	
+++ b/java/ql/src/Violations of Best Practice/Undesirable Calls/GarbageCollection.ql	
@@ -6,8 +6,10 @@
  * @problem.severity recommendation
  * @precision low
  * @id java/garbage-collection
- * @tags reliability
- *       maintainability
+ * @previous-id java/do-not-use-finalizers
+ * @tags quality
+ *       reliability
+ *       correctness
  */
 
 import java
diff --git a/java/ql/src/change-notes/released/1.7.0.md b/java/ql/src/change-notes/released/1.7.0.md
new file mode 100644
index 000000000000..f0485614fc32
--- /dev/null
+++ b/java/ql/src/change-notes/released/1.7.0.md
@@ -0,0 +1,15 @@
+## 1.7.0
+
+### New Queries
+
+* The query `java/insecure-spring-actuator-config` has been promoted from experimental to the main query pack as `java/spring-boot-exposed-actuators-config`. Its results will now appear by default. This query detects exposure of Spring Boot actuators through configuration files. It was originally submitted as an experimental query [by @luchua-bc](https://github.com/github/codeql/pull/5384).
+
+### Query Metadata Changes
+
+* The tag `maintainability` has been removed from `java/run-finalizers-on-exit` and the tags `quality`, `correctness`, and `performance` have been added.
+* The tag `maintainability` has been removed from `java/garbage-collection` and the tags `quality` and `correctness` have been added.
+
+### Minor Analysis Improvements
+
+* Fixed a bug that was causing false negatives in rare cases in the query `java/dereferenced-value-may-be-null`.
+* Removed the `java/empty-statement` query that was subsumed by the `java/empty-block` query.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 00b51441d882..d1184cc67507 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.3
+lastReleaseVersion: 1.7.0
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp b/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp
deleted file mode 100644
index e201156728a4..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.qhelp
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE qhelp PUBLIC "-//Semmle//qhelp//EN" "qhelp.dtd">
-<qhelp>
-  <overview>
-    <p>Spring Boot is a popular framework that facilitates the development of stand-alone applications
-and micro services. Spring Boot Actuator helps to expose production-ready support features against 
-Spring Boot applications.</p>
-
-    <p>Endpoints of Spring Boot Actuator allow to monitor and interact with a Spring Boot application. 
-Exposing unprotected actuator endpoints through configuration files can lead to information disclosure 
-or even remote code execution vulnerability.</p>
-
-    <p>Rather than programmatically permitting endpoint requests or enforcing access control, frequently
-developers simply leave management endpoints publicly accessible in the application configuration file 
-<code>application.properties</code> without enforcing access control through Spring Security.</p>
-  </overview>
-
-  <recommendation>
-    <p>Declare the Spring Boot Starter Security module in XML configuration or programmatically enforce 
-security checks on management endpoints using Spring Security. Otherwise accessing management endpoints 
-on a different HTTP port other than the port that the web application is listening on also helps to 
-improve the security.</p>
-  </recommendation>
-
-  <example>
-    <p>The following examples show both 'BAD' and 'GOOD' configurations. In the 'BAD' configuration, 
-no security module is declared and sensitive management endpoints are exposed. In the 'GOOD' configuration, 
-security is enforced and only endpoints requiring exposure are exposed.</p>
-    <sample src="pom_good.xml" />
-    <sample src="pom_bad.xml" />
-    <sample src="application.properties" />
-  </example>
-
-  <references>
-    <li>
-      Spring Boot documentation:
-      <a href="https://docs.spring.io/spring-boot/docs/current/reference/html/production-ready-features.html">Spring Boot Actuator: Production-ready Features</a>
-    </li>
-    <li>
-      VERACODE Blog:
-      <a href="https://www.veracode.com/blog/research/exploiting-spring-boot-actuators">Exploiting Spring Boot Actuators</a>
-    </li>
-    <li>
-      HackerOne Report:
-      <a href="https://hackerone.com/reports/862589">Spring Actuator endpoints publicly available, leading to account takeover</a>
-    </li>
-  </references>
-</qhelp>
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql b/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
deleted file mode 100644
index b21aa82e8baf..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @name Insecure Spring Boot Actuator Configuration
- * @description Exposed Spring Boot Actuator through configuration files without declarative or procedural
- *              security enforcement leads to information leak or even remote code execution.
- * @kind problem
- * @problem.severity error
- * @precision high
- * @id java/insecure-spring-actuator-config
- * @tags security
- *       experimental
- *       external/cwe/cwe-016
- */
-
-/*
- * Note this query requires properties files to be indexed before it can produce results.
- * If creating your own database with the CodeQL CLI, you should run
- * `codeql database index-files --language=properties ...`
- * If using lgtm.com, you should add `properties_files: true` to the index block of your
- * lgtm.yml file (see https://lgtm.com/help/lgtm/java-extraction)
- */
-
-import java
-import semmle.code.configfiles.ConfigFiles
-import semmle.code.xml.MavenPom
-
-/** The parent node of the `org.springframework.boot` group. */
-class SpringBootParent extends Parent {
-  SpringBootParent() { this.getGroup().getValue() = "org.springframework.boot" }
-}
-
-/** Class of Spring Boot dependencies. */
-class SpringBootPom extends Pom {
-  SpringBootPom() { this.getParentElement() instanceof SpringBootParent }
-
-  /** Holds if the Spring Boot Actuator module `spring-boot-starter-actuator` is used in the project. */
-  predicate isSpringBootActuatorUsed() {
-    this.getADependency().getArtifact().getValue() = "spring-boot-starter-actuator"
-  }
-
-  /**
-   * Holds if the Spring Boot Security module is used in the project, which brings in other security
-   * related libraries.
-   */
-  predicate isSpringBootSecurityUsed() {
-    this.getADependency().getArtifact().getValue() = "spring-boot-starter-security"
-  }
-}
-
-/** The properties file `application.properties`. */
-class ApplicationProperties extends ConfigPair {
-  ApplicationProperties() { this.getFile().getBaseName() = "application.properties" }
-}
-
-/** The configuration property `management.security.enabled`. */
-class ManagementSecurityConfig extends ApplicationProperties {
-  ManagementSecurityConfig() { this.getNameElement().getName() = "management.security.enabled" }
-
-  /** Gets the whitespace-trimmed value of this property. */
-  string getValue() { result = this.getValueElement().getValue().trim() }
-
-  /** Holds if `management.security.enabled` is set to `false`. */
-  predicate hasSecurityDisabled() { this.getValue() = "false" }
-
-  /** Holds if `management.security.enabled` is set to `true`. */
-  predicate hasSecurityEnabled() { this.getValue() = "true" }
-}
-
-/** The configuration property `management.endpoints.web.exposure.include`. */
-class ManagementEndPointInclude extends ApplicationProperties {
-  ManagementEndPointInclude() {
-    this.getNameElement().getName() = "management.endpoints.web.exposure.include"
-  }
-
-  /** Gets the whitespace-trimmed value of this property. */
-  string getValue() { result = this.getValueElement().getValue().trim() }
-}
-
-/**
- * Holds if `ApplicationProperties` ap of a repository managed by `SpringBootPom` pom
- * has a vulnerable configuration of Spring Boot Actuator management endpoints.
- */
-predicate hasConfidentialEndPointExposed(SpringBootPom pom, ApplicationProperties ap) {
-  pom.isSpringBootActuatorUsed() and
-  not pom.isSpringBootSecurityUsed() and
-  ap.getFile()
-      .getParentContainer()
-      .getAbsolutePath()
-      .matches(pom.getFile().getParentContainer().getAbsolutePath() + "%") and // in the same sub-directory
-  exists(string springBootVersion | springBootVersion = pom.getParentElement().getVersionString() |
-    springBootVersion.regexpMatch("1\\.[0-4].*") and // version 1.0, 1.1, ..., 1.4
-    not exists(ManagementSecurityConfig me |
-      me.hasSecurityEnabled() and me.getFile() = ap.getFile()
-    )
-    or
-    springBootVersion.matches("1.5%") and // version 1.5
-    exists(ManagementSecurityConfig me | me.hasSecurityDisabled() and me.getFile() = ap.getFile())
-    or
-    springBootVersion.matches("2.%") and //version 2.x
-    exists(ManagementEndPointInclude mi |
-      mi.getFile() = ap.getFile() and
-      (
-        mi.getValue() = "*" // all endpoints are enabled
-        or
-        mi.getValue()
-            .matches([
-                "%dump%", "%trace%", "%logfile%", "%shutdown%", "%startup%", "%mappings%", "%env%",
-                "%beans%", "%sessions%"
-              ]) // confidential endpoints to check although all endpoints apart from '/health' and '/info' are considered sensitive by Spring
-      )
-    )
-  )
-}
-
-deprecated query predicate problems(Dependency d, string message) {
-  exists(SpringBootPom pom |
-    hasConfidentialEndPointExposed(pom, _) and
-    d = pom.getADependency() and
-    d.getArtifact().getValue() = "spring-boot-starter-actuator"
-  ) and
-  message = "Insecure configuration of Spring Boot Actuator exposes sensitive endpoints."
-}
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/application.properties b/java/ql/src/experimental/Security/CWE/CWE-016/application.properties
deleted file mode 100644
index 4f5defdd948e..000000000000
--- a/java/ql/src/experimental/Security/CWE/CWE-016/application.properties
+++ /dev/null
@@ -1,22 +0,0 @@
-#management.endpoints.web.base-path=/admin
-
-
-#### BAD: All management endpoints are accessible #### 
-# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
-
-# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=false
-
-# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
-management.endpoints.web.exposure.include=*
-
-
-#### GOOD: All management endpoints have access control #### 
-# safe configuration (spring boot 1.0 - 1.4): exposes actuators by default
-management.security.enabled=true
-
-# safe configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=true
-
-# safe configuration (spring boot 2+): exposes health and info only by default, here overridden to expose one additional endpoint which we assume is intentional and safe.
-management.endpoints.web.exposure.include=beans,info,health
diff --git a/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll b/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll
index 88598e615896..0e28d9ffe5e3 100644
--- a/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll
+++ b/java/ql/src/experimental/quantum/Analysis/ArtifactReuse.qll
@@ -10,15 +10,11 @@ import experimental.quantum.Language
  */
 private module WrapperConfig implements DataFlow::ConfigSig {
   predicate isSource(DataFlow::Node source) {
-    exists(Call c |
-      c = source.asExpr()
-      // not handling references yet, I think we want to flat say references are only ok
-      // if I know the source, otherwise, it has to be through an additional flow step, which
-      // we filter as a source, i.e., references are only allowed as sources only,
-      // no inferrece? Not sure if that would work
-      //or
-      //   source.(DataFlow::PostUpdateNode).getPreUpdateNode().asExpr() = c.getAnArgument()
-    ) and
+    source.asExpr() instanceof Call and
+    // not handling references yet, I think we want to flat say references are only ok
+    // if I know the source, otherwise, it has to be through an additional flow step, which
+    // we filter as a source, i.e., references are only allowed as sources only,
+    // no inferrece? Not sure if that would work
     // Filter out sources that are known additional flow steps, as these are likely not the
     // kind of wrapper source we are looking for.
     not exists(AdditionalFlowInputStep s | s.getOutput() = source)
diff --git a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
index 7291ea554a58..1aee95152328 100644
--- a/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
+++ b/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
@@ -12,7 +12,7 @@
  */
 
 //THIS QUERY IS A REPLICA OF: https://github.com/github/codeql/blob/main/java/ql/src/Security/CWE/CWE-327/BrokenCryptoAlgorithm.ql
-//but uses the **NEW MODELLING**
+//but uses the **NEW MODELING**
 import experimental.quantum.Language
 
 /**
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index e7a63231064f..022815c208e1 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.6.3
+version: 1.7.0
 groups:
   - java
   - queries
diff --git a/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll b/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
index af0f501621a1..5ab1584f8668 100644
--- a/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
+++ b/java/ql/src/utils/flowtestcasegenerator/FlowTestCase.qll
@@ -253,7 +253,7 @@ class TestCase extends TTestCase {
 
   /**
    * Returns a call to `source()` wrapped in `newWith` methods as needed according to `input`.
-   * For example, if the input specification is `ArrayElement of MapValue of Argument[0]`, this
+   * For example, if the `stack` is `Argument[0].MapValue.ArrayElement`, this
    * will return `newWithMapValue(newWithArrayElement(source()))`.
    */
   string getInput(SummaryComponentStack stack) {
@@ -269,7 +269,7 @@ class TestCase extends TTestCase {
 
   /**
    * Returns `out` wrapped in `get` methods as needed according to `output`.
-   * For example, if the output specification is `ArrayElement of MapValue of Argument[0]`, this
+   * For example, if the `componentStack` is `Argument[0].MapValue.ArrayElement`, this
    * will return `getArrayElement(getMapValue(out))`.
    */
   string getOutput(SummaryComponentStack componentStack) {
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected b/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected
deleted file mode 100644
index 486302939857..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.expected
+++ /dev/null
@@ -1 +0,0 @@
-| pom.xml:29:9:32:22 | dependency | Insecure configuration of Spring Boot Actuator exposes sensitive endpoints. |
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref b/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref
deleted file mode 100644
index 9cd12d5e4fb1..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/InsecureSpringActuatorConfig.qlref
+++ /dev/null
@@ -1 +0,0 @@
-experimental/Security/CWE/CWE-016/InsecureSpringActuatorConfig.ql
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java b/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java
deleted file mode 100644
index a3ff69c1b817..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/SensitiveInfo.java
+++ /dev/null
@@ -1,13 +0,0 @@
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-@Controller
-public class SensitiveInfo {
-	@RequestMapping
-	public void handleLogin(@RequestParam String username, @RequestParam String password) throws Exception {
-		if (!username.equals("") && password.equals("")) {
-			//Blank processing
-		}
-	}
-}
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/application.properties b/java/ql/test/experimental/query-tests/security/CWE-016/application.properties
deleted file mode 100644
index 797906a3ca3b..000000000000
--- a/java/ql/test/experimental/query-tests/security/CWE-016/application.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-#management.endpoints.web.base-path=/admin
-
-# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
-
-# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
-management.security.enabled=false
-
-# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
-management.endpoints.web.exposure.include=*
-management.endpoints.web.exposure.exclude=beans
-
-management.endpoint.shutdown.enabled=true
-
-management.endpoint.health.show-details=when_authorized
\ No newline at end of file
diff --git a/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected
new file mode 100644
index 000000000000..cad6d0097c7b
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.expected
@@ -0,0 +1,6 @@
+| ExampleRuntimeExit.java:22:17:22:44 | exit(...) | Avoid calls to Runtime.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeExit.java:25:17:25:44 | exit(...) | Avoid calls to Runtime.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeHalt.java:18:17:18:44 | halt(...) | Avoid calls to Runtime.halt() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleRuntimeHalt.java:21:17:21:44 | halt(...) | Avoid calls to Runtime.halt() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleSystemExit.java:22:17:22:30 | exit(...) | Avoid calls to System.exit() as this prevents runtime cleanup and makes code harder to reuse. |
+| ExampleSystemExit.java:25:17:25:30 | exit(...) | Avoid calls to System.exit() as this prevents runtime cleanup and makes code harder to reuse. |
diff --git a/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref
new file mode 100644
index 000000000000..4561fcfcfd04
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/CallsToSystemExit.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Undesirable Calls/CallsToSystemExit.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java
new file mode 100644
index 000000000000..13fd53b11419
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeExit.java
@@ -0,0 +1,37 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleRuntimeExit {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        try {
+            action.run();
+        } catch (Exception e) {
+            printUsageAndExit(e.getMessage(), 1);
+        }
+        Runtime.getRuntime().exit(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                Runtime.getRuntime().exit(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                Runtime.getRuntime().exit(1); // $ Alert
+            } catch (Exception e) {
+                // re-throw the exception
+                throw e;
+            }
+        }
+    }
+
+    protected static void printUsageAndExit(final String message, final int exitCode) {
+        System.err.println("Usage: <example_cmd> <example_args> : " + message);
+        Runtime.getRuntime().exit(exitCode); // COMPLIANT
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java
new file mode 100644
index 000000000000..b1d4be04f201
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleRuntimeHalt.java
@@ -0,0 +1,25 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleRuntimeHalt {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        action.run();
+        Runtime.getRuntime().halt(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                Runtime.getRuntime().halt(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                Runtime.getRuntime().halt(1); // $ Alert
+            }
+        }
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java b/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java
new file mode 100644
index 000000000000..dece6e689ba1
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/ExampleSystemExit.java
@@ -0,0 +1,37 @@
+import java.io.FileOutputStream;
+import java.io.IOException;
+
+public class ExampleSystemExit {
+
+    public static void main(String[] args) {
+        Action action = new Action();
+        try {
+            action.run();
+        } catch (Exception e) {
+            printUsageAndExit(e.getMessage(), 1);
+        }
+        System.exit(0); // COMPLIANT
+    }
+
+    static class Action {
+        public void run() {
+            try {
+                FileOutputStream fos = new FileOutputStream("output.txt");
+                fos.write("Hello, World!".getBytes());
+                fos.close();
+                System.exit(0); // $ Alert
+            } catch (IOException e) {
+                e.printStackTrace();
+                System.exit(1); // $ Alert
+            } catch (Exception e) {
+                // re-throw the exception
+                throw e;
+            }
+        }
+    }
+
+    protected static void printUsageAndExit(final String message, final int exitCode) {
+        System.err.println("Usage: <example_cmd> <example_args> : " + message);
+        System.exit(exitCode); // COMPLIANT
+    }
+}
diff --git a/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java b/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java
new file mode 100644
index 000000000000..459f944d7985
--- /dev/null
+++ b/java/ql/test/query-tests/CallsToSystemExit/LocalClassInTestMethod.java
@@ -0,0 +1,26 @@
+public class LocalClassInTestMethod {
+    public void testNestedCase() {
+        class OuterLocalClass {
+            void func() {
+                class NestedLocalClass {
+                    void nestedMethod() {
+                        System.exit(4);
+                        Runtime.getRuntime().halt(5);
+                    }
+                }
+            }
+        }
+        OuterLocalClass outer = new OuterLocalClass();
+        outer.func();
+    }
+    public void testNestedCase2() {
+        class OuterLocalClass {
+            class NestedLocalClass {
+                void nestedMethod() {
+                    System.exit(4);
+                    Runtime.getRuntime().halt(5);
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java
new file mode 100644
index 000000000000..70a0091ec370
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/Employee.java
@@ -0,0 +1,10 @@
+/**
+ * Underlying data type of the ORM class and functions.
+ */
+public class Employee {
+  Employee(String name) {
+    this.name = name;
+  }
+
+  String name;
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java
new file mode 100644
index 000000000000..4aa40d97ec37
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeRecord.java
@@ -0,0 +1,26 @@
+/**
+ * Sample ORM class for the type `Employee`.
+ */
+public class EmployeeRecord {
+  public int add(Employee employee) {
+    return 1;
+  }
+
+  public Employee get(String name) {
+    return new Employee("Sample");
+  }
+
+  public int update(Employee employee, String newName) {
+    return 1;
+  }
+
+  public int delete(Employee employee) {
+    return 1;
+  }
+
+  private void f() { }
+
+  private void g() { }
+
+  private void h() { }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java
new file mode 100644
index 000000000000..3b581bb39ef8
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/EmployeeStatus.java
@@ -0,0 +1,9 @@
+/**
+ * Simple class with a single public method to test the edge case.
+ * When this single method is mocked, it means ALL public methods are mocked.
+ */
+public class EmployeeStatus {
+    public String getStatus() {
+        return "active";
+    }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected
new file mode 100644
index 000000000000..d3e95329380f
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.expected
@@ -0,0 +1,2 @@
+| TestORM.java:34:15:34:27 | nonCompliant1 | This test method mocks all public methods of a $@. | EmployeeRecord.java:4:14:4:27 | EmployeeRecord | class or an interface |
+| TestORM.java:47:15:47:27 | nonCompliant2 | This test method mocks all public methods of a $@. | EmployeeRecord.java:4:14:4:27 | EmployeeRecord | class or an interface |
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref
new file mode 100644
index 000000000000..81a949135180
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/ExcessivePublicMethodMocking.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Testing/ExcessivePublicMethodMocking.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java b/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java
new file mode 100644
index 000000000000..eadf01515067
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/TestORM.java
@@ -0,0 +1,65 @@
+import org.junit.Test;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.doReturn;
+
+public class TestORM {
+  /**
+   * Test of form `when(mockedObject.methodToBeMocked()).thenReturn(someVal)`.
+   */
+  @Test
+  public void compliant1() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+  }
+
+  /**
+   * Test of form `doReturn(someVal).when(mockedObject).methodToBeMocked()`.
+   */
+  @Test
+  public void compliant2() {
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // COMPLIANT: Only some of the public methods belonging to the mocked object are used
+    doReturn(0).when(employeeRecordMock).add(sampleEmployee); // Mocked EmployeeRecord.add
+    doReturn(0).when(employeeRecordMock).get("John Doe"); // Mocked EmployeeRecord.get
+    doReturn(0).when(employeeRecordMock).delete(sampleEmployee); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Test of form `when(mockedObject.methodToBeMocked()).thenReturn(someVal)`.
+   */
+  @Test
+  public void nonCompliant1() { // $ Alert
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // NON_COMPLIANT: All public methods of the mocked object are used
+    when(employeeRecordMock.add(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.add
+    when(employeeRecordMock.get("John Doe")).thenReturn(sampleEmployee); // Mocked EmployeeRecord.get
+    when(employeeRecordMock.update(sampleEmployee, "Jane Doe")).thenReturn(0); // Mocked EmployeeRecord.update
+    when(employeeRecordMock.delete(sampleEmployee)).thenReturn(0); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Test of form `doReturn(someVal).when(mockedObject).methodToBeMocked()`.
+   */
+  @Test
+  public void nonCompliant2() { // $ Alert
+    Employee sampleEmployee = new Employee("John Doe");
+    EmployeeRecord employeeRecordMock = mock(EmployeeRecord.class); // NON_COMPLIANT: All public methods of the mocked object are used
+    doReturn(0).when(employeeRecordMock).add(sampleEmployee); // Mocked EmployeeRecord.add
+    doReturn(0).when(employeeRecordMock).get("John Doe"); // Mocked EmployeeRecord.get
+    doReturn(0).when(employeeRecordMock).update(sampleEmployee, "Jane Doe"); // Mocked EmployeeRecord.update
+    doReturn(0).when(employeeRecordMock).delete(sampleEmployee); // Mocked EmployeeRecord.delete
+  }
+
+  /**
+   * Edge case: Class with single public method - should NOT be flagged.
+   * When there's only one public method, mocking it doesn't indicate a "too big" test.
+   */
+  @Test
+  public void compliantSingleMethod() {
+    EmployeeStatus statusMock = mock(EmployeeStatus.class); // COMPLIANT: Single public method, no choice but to mock it if needed
+    when(statusMock.getStatus()).thenReturn("inactive"); // Mocked EmployeeStatus.getStatus (the only public method, but that's OK)
+  }
+}
diff --git a/java/ql/test/query-tests/ExcessivePublicMethodMocking/options b/java/ql/test/query-tests/ExcessivePublicMethodMocking/options
new file mode 100644
index 000000000000..8dbd14d41c15
--- /dev/null
+++ b/java/ql/test/query-tests/ExcessivePublicMethodMocking/options
@@ -0,0 +1 @@
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../stubs/junit-4.13:${testdir}/../../stubs/mockito-5.14
diff --git a/java/ql/test/query-tests/Nullness/B.java b/java/ql/test/query-tests/Nullness/B.java
index 99bd6f4a1bae..b21d581535df 100644
--- a/java/ql/test/query-tests/Nullness/B.java
+++ b/java/ql/test/query-tests/Nullness/B.java
@@ -436,4 +436,83 @@ public void corrCondLoop2(boolean a[]) {
       }
     }
   }
+
+  public void loopCorrTest1(int[] a) {
+    boolean ready = a.length > 7;
+    Object x = new Object();
+    for (int i = 0; i < a.length; i++) {
+      // condition correlates with itself through iterations when ready isn't updated
+      if (!ready) {
+        x = null;
+      } else {
+        x.hashCode(); // Spurious NPE - false positive
+      }
+      if ((a[i] & 1) != 0) {
+        ready = (a[i] & 2) != 0;
+        x = new Object();
+      }
+    }
+  }
+
+  public void loopCorrTest2(boolean[] a) {
+    Object x = new Object();
+    boolean cur = a[0];
+    for (int i = 1; i < a.length; i++) {
+      boolean prev = cur;
+      cur = a[i];
+      if (!prev) {
+        // correctly guarded by !cur from the _previous_ iteration
+        x.hashCode(); // Spurious NPE - false positive
+      } else {
+        x = new Object();
+      }
+      if (cur) {
+        x = null;
+      }
+    }
+  }
+
+  public void loopCorrTest3(String[] ss) {
+    Object x = null;
+    Object t = null;
+    for (String s : ss) {
+      if (t == null) {
+        t = s;
+      } else {
+        if (t instanceof String) {
+          x = new Object();
+          t = new Object();
+        }
+        // correctly guarded by t: null -> String -> Object
+        x.hashCode(); // Spurious NPE - false positive
+      }
+    }
+  }
+
+  public void initCorr(boolean b) {
+    Object o2 = b ? null : "";
+    if (b)
+      o2 = "";
+    else
+      o2.hashCode(); // OK
+  }
+
+  public void complexLoopTest(int[] xs, int[] ys) {
+    int len = ys != null ? ys.length : 0;
+    for (int i = 0, j = 0; i < xs.length; i++) {
+      if (j < len && ys[j] == 42) { // OK
+        j++;
+      } else if (j > 0) {
+        ys[0]++; // OK
+      }
+    }
+  }
+
+  public void trackTest(Object o, int n) {
+    boolean isnull = o == null;
+    int c = -1;
+    if (maybe) { }
+    if (c == 100) { return; }
+    o.hashCode(); // NPE
+  }
 }
diff --git a/java/ql/test/query-tests/Nullness/NullMaybe.expected b/java/ql/test/query-tests/Nullness/NullMaybe.expected
index 9f2920293b07..f0d671d58bd0 100644
--- a/java/ql/test/query-tests/Nullness/NullMaybe.expected
+++ b/java/ql/test/query-tests/Nullness/NullMaybe.expected
@@ -18,6 +18,10 @@
 | B.java:279:7:279:7 | a | Variable $@ may be null at this access because of $@ assignment. | B.java:276:5:276:19 | int[] a | a | B.java:276:11:276:18 | a | this |
 | B.java:292:7:292:7 | b | Variable $@ may be null at this access because of $@ assignment. | B.java:287:5:287:44 | int[] b | b | B.java:287:11:287:43 | b | this |
 | B.java:408:7:408:7 | x | Variable $@ may be null at this access as suggested by $@ null guard. | B.java:374:23:374:30 | x | x | B.java:375:23:375:31 | ... != ... | this |
+| B.java:448:9:448:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:442:5:442:28 | Object x | x | B.java:446:9:446:16 | ...=... | this |
+| B.java:465:9:465:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:458:5:458:28 | Object x | x | B.java:470:9:470:16 | ...=... | this |
+| B.java:487:9:487:9 | x | Variable $@ may be null at this access because of $@ assignment. | B.java:476:5:476:20 | Object x | x | B.java:476:12:476:19 | x | this |
+| B.java:516:5:516:5 | o | Variable $@ may be null at this access as suggested by $@ null guard. | B.java:511:25:511:32 | o | o | B.java:512:22:512:30 | ... == ... | this |
 | C.java:9:44:9:45 | a2 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:6:5:6:23 | long[][] a2 | a2 | C.java:7:34:7:54 | ... != ... | this |
 | C.java:9:44:9:45 | a2 | Variable $@ may be null at this access because of $@ assignment. | C.java:6:5:6:23 | long[][] a2 | a2 | C.java:6:14:6:22 | a2 | this |
 | C.java:10:17:10:18 | a3 | Variable $@ may be null at this access as suggested by $@ null guard. | C.java:8:5:8:21 | long[] a3 | a3 | C.java:9:38:9:58 | ... != ... | this |
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected
new file mode 100644
index 000000000000..61f5b0ffc579
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.expected
@@ -0,0 +1,17 @@
+| packageone/SourcePackage.java:9:21:9:32 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:10:21:10:32 | Annotated.m2 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:11:26:11:27 | m2 | element |
+| packageone/SourcePackage.java:16:18:16:36 | fPublic(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:26:23:26:29 | fPublic | element |
+| packageone/SourcePackage.java:17:18:17:39 | fProtected(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:31:26:31:35 | fProtected | element |
+| packageone/SourcePackage.java:25:31:25:42 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:26:31:26:42 | Annotated.m2 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:11:26:11:27 | m2 | element |
+| packageone/SourcePackage.java:29:28:29:46 | fPublic(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:26:23:26:29 | fPublic | element |
+| packageone/SourcePackage.java:30:28:30:49 | fProtected(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:31:26:31:35 | fProtected | element |
+| packageone/SourcePackage.java:34:23:34:34 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:35:30:35:41 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:36:31:36:42 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packageone/SourcePackage.java:37:33:37:44 | Annotated.m1 | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:9:29:9:30 | m1 | element |
+| packagetwo/Source.java:8:20:8:30 | Annotated.m | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:7:19:7:19 | m | element |
+| packagetwo/Source.java:14:17:14:29 | f(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:16:16:16:16 | f | element |
+| packagetwo/Source.java:20:28:20:47 | new AnnotatedClass(...) | Access of $@ annotated with VisibleForTesting found in production code. | packageone/AnnotatedClass.java:4:14:4:27 | AnnotatedClass | element |
+| packagetwo/Source.java:24:30:24:40 | Annotated.m | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:7:19:7:19 | m | element |
+| packagetwo/Source.java:28:27:28:39 | f(...) | Access of $@ annotated with VisibleForTesting found in production code. | packagetwo/Annotated.java:16:16:16:16 | f | element |
\ No newline at end of file
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref
new file mode 100644
index 000000000000..57947f804319
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/VisibleForTestingAbuse.qlref
@@ -0,0 +1,2 @@
+query: Violations of Best Practice/Implementation Hiding/VisibleForTestingAbuse.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java
new file mode 100644
index 000000000000..1fdbea1571e2
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/AnnotatedClass.java
@@ -0,0 +1,6 @@
+package packageone;
+
+@VisibleForTesting
+public class AnnotatedClass {
+    public AnnotatedClass() {}
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java
new file mode 100644
index 000000000000..7826f5e1ee0e
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage.java
@@ -0,0 +1,38 @@
+package packageone;
+
+import packagetwo.Annotated;
+
+public class SourcePackage extends Annotated {
+    void f() {
+        // Fields - cross-package access (only accessible ones)
+        // String s = Annotated.m; // Cannot access package-private from different package
+        String s1 = Annotated.m1; // $ Alert
+        String s2 = Annotated.m2; // $ Alert
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods - cross-package access (only accessible ones)
+        // int i = Annotated.f(); // Cannot access package-private from different package
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic(); // $ Alert
+        int i3 = Annotated.fProtected(); // $ Alert
+        
+        // Same package class
+        AnnotatedClass a = new AnnotatedClass(); // COMPLIANT - same package
+        
+        // Lambda usage - cross-package (only accessible members)
+        Runnable lambda = () -> {
+            // String lambdaS = Annotated.m; // Cannot access package-private
+            String lambdaS1 = Annotated.m1; // $ Alert
+            String lambdaS2 = Annotated.m2; // $ Alert
+            
+            // int lambdaI = Annotated.f(); // Cannot access package-private
+            int lambdaI2 = Annotated.fPublic(); // $ Alert
+            int lambdaI3 = Annotated.fProtected(); // $ Alert
+        };
+        lambda.run();
+    }
+    String myField1 = Annotated.m1; // $ Alert
+    public String myField2 = Annotated.m1; // $ Alert
+    private String myField3 = Annotated.m1; // $ Alert
+    protected String myField4 = Annotated.m1; // $ Alert
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java
new file mode 100644
index 000000000000..d47aa167b46c
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/SourcePackage1.java
@@ -0,0 +1,22 @@
+package packageone;
+
+import packagetwo.Annotated;
+
+public class SourcePackage1 extends Annotated {
+    @VisibleForTesting
+    public void f() {
+
+        String s1 = Annotated.m1;
+        String s2 = Annotated.m2;
+
+        int i2 = Annotated.fPublic();
+        int i3 = Annotated.fProtected();
+
+        Runnable lambda = () -> {
+            String lambdaS1 = Annotated.m1;
+            String lambdaS2 = Annotated.m2;
+            int lambdaI2 = Annotated.fPublic();
+            int lambdaI3 = Annotated.fProtected();
+        };
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java
new file mode 100644
index 000000000000..28aedbf4e539
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packageone/VisibleForTesting.java
@@ -0,0 +1,4 @@
+package packageone;
+
+public @interface VisibleForTesting {
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java
new file mode 100644
index 000000000000..ad5dbed3f9b6
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Annotated.java
@@ -0,0 +1,92 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Annotated {
+    @VisibleForTesting
+    static String m;
+    @VisibleForTesting
+    static protected String m1;
+    @VisibleForTesting
+    static public String m2;
+    @VisibleForTesting
+    static private String m3;
+
+    @VisibleForTesting
+    static int f() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static private int fPrivate() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static public int fPublic() {
+        return 1;
+    }
+
+    @VisibleForTesting
+    static protected int fProtected() {
+        return 1;
+    }
+
+    private static void resetPriorities() {
+        String priority = m;
+        String priority1 = m1;
+        String priority2 = m2;
+        String priority3 = m3;
+
+        int result = f();
+        int resultPrivate = fPrivate();
+        int resultPublic = fPublic();
+        int resultProtected = fProtected();
+    }
+
+    private static void resetPriorities2() {
+        Runnable task = () -> {
+            String priority = m;
+            String priority1 = m1;
+            String priority2 = m2;
+            String priority3 = m3;
+
+            int result = f();
+            int resultPrivate = fPrivate();
+            int resultPublic = fPublic();
+            int resultProtected = fProtected();
+        };
+        task.run();
+    }
+
+    private static class InnerClass {
+        void useVisibleForMembers() {
+            String field = m;
+            String field1 = m1;
+            String field2 = m2;
+            String field3 = m3;
+
+            int method = f();
+            int methodPrivate = fPrivate();
+            int methodPublic = fPublic();
+            int methodProtected = fProtected();
+        }
+    }
+
+    @VisibleForTesting
+    static class InnerTestClass {
+        @VisibleForTesting
+        int getSize() {
+            return 42;
+        }
+        
+        @VisibleForTesting
+        private String data;
+    }
+    
+    private void useInnerClass() {
+        InnerTestClass inner = new InnerTestClass();
+        int size = inner.getSize();
+        String value = inner.data;
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java
new file mode 100644
index 000000000000..94a5cccfd43b
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Source.java
@@ -0,0 +1,34 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Source {
+    void f() {
+        // Fields
+        String s = Annotated.m; // $ Alert
+        String s1 = Annotated.m1; // COMPLIANT - same package
+        String s2 = Annotated.m2;
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods
+        int i = Annotated.f(); // $ Alert
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic();
+        int i3 = Annotated.fProtected();
+        
+        // Other class
+        AnnotatedClass a = new AnnotatedClass(); // $ Alert
+        
+        // Lambda usage
+        Runnable lambda = () -> {
+            String lambdaS = Annotated.m; // $ Alert
+            String lambdaS1 = Annotated.m1;
+            String lambdaS2 = Annotated.m2;
+            
+            int lambdaI = Annotated.f(); // $ Alert
+            int lambdaI2 = Annotated.fPublic();
+            int lambdaI3 = Annotated.fProtected();
+        };
+        lambda.run();
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java
new file mode 100644
index 000000000000..b861d921e9a3
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/Test.java
@@ -0,0 +1,34 @@
+package packagetwo;
+
+import packageone.*;
+
+public class Test {
+    void f() {
+        // Fields
+        String s = Annotated.m; // COMPLIANT
+        String s1 = Annotated.m1; // COMPLIANT
+        String s2 = Annotated.m2; // COMPLIANT
+        // String s3 = Annotated.m3; // Cannot access private field
+        
+        // Methods
+        int i = Annotated.f(); // COMPLIANT
+        // int i1 = Annotated.fPrivate(); // Cannot access private method
+        int i2 = Annotated.fPublic(); // COMPLIANT
+        int i3 = Annotated.fProtected(); // COMPLIANT
+        
+        // Other class
+        AnnotatedClass a = new AnnotatedClass(); // COMPLIANT
+        
+        // Lambda usage
+        Runnable lambda = () -> {
+            String lambdaS = Annotated.m; // COMPLIANT
+            String lambdaS1 = Annotated.m1; // COMPLIANT
+            String lambdaS2 = Annotated.m2; // COMPLIANT
+            
+            int lambdaI = Annotated.f(); // COMPLIANT
+            int lambdaI2 = Annotated.fPublic(); // COMPLIANT
+            int lambdaI3 = Annotated.fProtected(); // COMPLIANT
+        };
+        lambda.run();
+    }
+}
diff --git a/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java
new file mode 100644
index 000000000000..f6cdb32d53c7
--- /dev/null
+++ b/java/ql/test/query-tests/VisibleForTestingAbuse/packagetwo/UseWithinAnnotation.java
@@ -0,0 +1,18 @@
+package packagetwo;
+
+import packageone.*;
+
+@interface Range {
+    int min() default 0;
+    int max() default 100;
+}
+
+public class UseWithinAnnotation {
+    @VisibleForTesting
+    static final int MAX_LISTING_LENGTH_MIN = 1;
+    @VisibleForTesting
+    static final int MAX_LISTING_LENGTH_MAX = 1000;
+
+    @Range(min = MAX_LISTING_LENGTH_MIN, max = MAX_LISTING_LENGTH_MAX)
+    private int maxListingLength = MAX_LISTING_LENGTH_MAX;
+}
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected
new file mode 100644
index 000000000000..8845d970df2a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.expected
@@ -0,0 +1,8 @@
+| Version1.0.x-1.4.x/bad/default/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | file://:0:0:0:0 | (none) | configuration |
+| Version1.0.x-1.4.x/bad/false/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version1.0.x-1.4.x/bad/false/application.properties:2:1:2:33 | management.security.enabled=false | configuration |
+| Version1.5.x/bad/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version1.5.x/bad/application.properties:2:1:2:33 | management.security.enabled=false | configuration |
+| Version2.x/bad/expose/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/expose/application.properties:2:1:2:33 | management.endpoints.web.expose=* | configuration |
+| Version2.x/bad/exposure-include/all-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/exposure-include/all-exposed/application.properties:2:1:2:43 | management.endpoints.web.exposure.include=* | configuration |
+| Version2.x/bad/exposure-include/some-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version2.x/bad/exposure-include/some-exposed/application.properties:2:1:2:59 | management.endpoints.web.exposure.include=health,info,beans | configuration |
+| Version3.x/bad/all-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version3.x/bad/all-exposed/application.properties:2:1:2:43 | management.endpoints.web.exposure.include=* | configuration |
+| Version3.x/bad/some-exposed/pom.xml:29:9:32:22 | dependency | Insecure Spring Boot actuator $@ exposes sensitive endpoints. | Version3.x/bad/some-exposed/application.properties:2:1:2:59 | management.endpoints.web.exposure.include=health,info,beans | configuration |
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref
new file mode 100644
index 000000000000..eec8ba18ae18
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/SpringBootActuatorsConfig.qlref
@@ -0,0 +1,2 @@
+query: Security/CWE/CWE-200/SpringBootActuatorsConfig/SpringBootActuatorsConfig.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties
new file mode 100644
index 000000000000..a41bbc9fdca3
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/application.properties
@@ -0,0 +1 @@
+# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
\ No newline at end of file
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
similarity index 93%
rename from java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
index 9dd5c9c188b4..83c7d2685f37 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-016/pom_bad.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/default/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>1.2.6.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -29,18 +29,15 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency> <!-- $ Alert -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
-
-        <!-- BAD: No Spring Security enabled -->
         <!-- dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties
new file mode 100644
index 000000000000..621b859214cb
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 1.0 - 1.4): exposes actuators by default
+management.security.enabled=false
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml
new file mode 100644
index 000000000000..83c7d2685f37
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/bad/false/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties
new file mode 100644
index 000000000000..6cadc4c756d1
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 1.0 - 1.4): exposes actuators by default
+management.security.enabled=true
\ No newline at end of file
diff --git a/java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
similarity index 94%
rename from java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
index 89f577f21e59..452d4b69c354 100644
--- a/java/ql/src/experimental/Security/CWE/CWE-016/pom_good.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.0.x-1.4.x/good/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>1.2.6.RELEASE</version>
         <relativePath/>
     </parent>
 
@@ -34,13 +34,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
         </dependency>
-
-        <!-- GOOD: Enable Spring Security -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-test</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties
new file mode 100644
index 000000000000..f1e8f6587d05
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 1.5+): requires value false to expose sensitive actuators
+management.security.enabled=false
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml
new file mode 100644
index 000000000000..aa1a4bcaf056
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/bad/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties
new file mode 100644
index 000000000000..bec45a22b82d
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 1.5+): requires value false to expose sensitive actuators
+management.security.enabled=true
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml
new file mode 100644
index 000000000000..39b46bef7e48
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version1.5.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>1.5.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties
new file mode 100644
index 000000000000..338b1fb3a9c1
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2.0.0.RC1): exposes health and info only by default, here overridden to expose everything
+management.endpoints.web.expose=*
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml
new file mode 100644
index 000000000000..c22f08d7e7ec
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/expose/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties
new file mode 100644
index 000000000000..bbc1915b05e1
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to expose everything
+management.endpoints.web.exposure.include=*
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml
new file mode 100644
index 000000000000..c22f08d7e7ec
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/all-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties
new file mode 100644
index 000000000000..1f29407c1923
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 2+): exposes health and info only by default, here overridden to also expose beans
+management.endpoints.web.exposure.include=health,info,beans
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml
new file mode 100644
index 000000000000..c22f08d7e7ec
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/bad/exposure-include/some-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties
new file mode 100644
index 000000000000..f7e0c1b43ac3
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 2+): exposes health and info only by default
+management.endpoints.web.exposure.include=info,health
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml
new file mode 100644
index 000000000000..e65ebf04701a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version2.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>2.2.6.RELEASE</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties
new file mode 100644
index 000000000000..c5570065bae5
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 3+): exposes health only by default, here overridden to expose everything
+management.endpoints.web.exposure.include=*
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
similarity index 95%
rename from java/ql/test/experimental/query-tests/security/CWE-016/pom.xml
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
index a9d5fa920c84..12dab1d9421a 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/pom.xml
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/all-exposed/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.3.8.RELEASE</version>
+        <version>3.3.5</version>
         <relativePath/>
     </parent>
 
@@ -29,7 +29,7 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
-        </dependency>
+        </dependency> <!-- $ Alert -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-devtools</artifactId>
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties
new file mode 100644
index 000000000000..27d08eac74f6
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/application.properties
@@ -0,0 +1,2 @@
+# vulnerable configuration (spring boot 3+): exposes health only by default, here overridden to also expose info and beans
+management.endpoints.web.exposure.include=health,info,beans
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml
new file mode 100644
index 000000000000..12dab1d9421a
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/bad/some-exposed/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.3.5</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency> <!-- $ Alert -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <!-- dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties
new file mode 100644
index 000000000000..8ba56eadc351
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/application.properties
@@ -0,0 +1,2 @@
+# safe configuration (spring boot 3+): exposes health only by default.
+management.endpoints.web.exposure.include=health
\ No newline at end of file
diff --git a/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml
new file mode 100644
index 000000000000..a8103e681e4c
--- /dev/null
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/Version3.x/good/pom.xml
@@ -0,0 +1,47 @@
+<?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>spring-boot-actuator-app</groupId>
+    <artifactId>spring-boot-actuator-app</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>1.8</maven.compiler.source>
+        <maven.compiler.target>1.8</maven.compiler.target>
+    </properties>
+
+    <parent>
+        <groupId>org.springframework.boot</groupId>
+        <artifactId>spring-boot-starter-parent</artifactId>
+        <version>3.3.5</version>
+        <relativePath/>
+    </parent>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-actuator</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-devtools</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-security</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-test</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file
diff --git a/java/ql/test/experimental/query-tests/security/CWE-016/options b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
similarity index 62%
rename from java/ql/test/experimental/query-tests/security/CWE-016/options
rename to java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
index 2ce7a4743cd3..ab29fd4e46fa 100644
--- a/java/ql/test/experimental/query-tests/security/CWE-016/options
+++ b/java/ql/test/query-tests/security/CWE-200/semmle/tests/SpringBootActuatorsConfig/options
@@ -1 +1 @@
-//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../stubs/springframework-5.8.x
+//semmle-extractor-options: --javac-args -cp ${testdir}/../../../../../../stubs/springframework-5.8.x
diff --git a/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt b/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt
new file mode 100644
index 000000000000..fb686291a055
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/LICENSE-junit.txt
@@ -0,0 +1,214 @@
+JUnit
+
+Eclipse Public License - v 1.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 code and
+         documentation 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 additions to
+the Program which: (i) are separate modules of software distributed in
+conjunction with the Program under their own license agreement, and (ii) are
+not derivative works of the Program. 
+
+"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,
+including all Contributors.
+
+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, in source code and object code form.
+
+      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 and
+object code 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. 
+
+3. REQUIREMENTS
+
+A Contributor may choose to distribute the Program in object code form under
+its own license agreement, provided that:
+
+      a) it complies with the terms and conditions of this Agreement; and
+
+      b) its license agreement:
+
+      i) effectively disclaims on behalf of all 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 Contributors all liability for
+damages, including direct, indirect, special, incidental and consequential
+damages, such as lost profits; 
+
+      iii) states that any provisions which differ from this Agreement are
+offered by that Contributor alone and not by any other party; and
+
+      iv) states that source code for the Program is available from such
+Contributor, and informs licensees how to obtain it in a reasonable manner on
+or through a medium customarily used for software exchange. 
+
+When the Program is made available in source code form:
+
+      a) it must be made available under this Agreement; and 
+
+      b) a copy of this Agreement must be included with each copy of the
+Program. 
+
+Contributors may not remove or alter any copyright notices contained within the
+Program.
+
+Each Contributor must identify itself as the originator of its Contribution, if
+any, in a manner that reasonably allows subsequent Recipients to identify the
+originator of the Contribution.
+
+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, 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, 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.
+
+This Agreement is governed by the laws of the State of New York and the
+intellectual property laws of the United States of America. No party to this
+Agreement will bring a legal action under this Agreement more than one year
+after the cause of action arose. Each party waives its rights to a jury trial
+in any resulting litigation. 
+
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/Assert.java b/java/ql/test/stubs/junit-4.13/org/junit/Assert.java
new file mode 100644
index 000000000000..cbd86acdb81c
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/Assert.java
@@ -0,0 +1,472 @@
+package org.junit;
+
+import org.junit.function.ThrowingRunnable;
+
+//BSD License
+//
+//Copyright (c) 2000-2006, www.hamcrest.org
+//All rights reserved.
+//
+//Redistribution and use in source and binary forms, with or without
+//modification, are permitted provided that the following conditions are met:
+//
+//Redistributions of source code must retain the above copyright notice, this list of
+//conditions and the following disclaimer. Redistributions in binary form must reproduce
+//the above copyright notice, this list of conditions and the following disclaimer in
+//the documentation and/or other materials provided with the distribution.
+//
+//Neither the name of Hamcrest nor the names of its contributors may be used to endorse
+//or promote products derived from this software without specific prior written
+//permission.
+//
+//THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
+//EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+//OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT
+//SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+//INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
+//TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+//BUSINESS INTERRUPTION) 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 OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
+//DAMAGE.
+
+/*
+ * MODIFIED version of JUnit 4.13 as available at
+ *   https://search.maven.org/remotecontent?filepath=junit/junit/4.13/junit-4.13-sources.jar
+ * Only parts of this file have been retained for test purposes.
+ */
+
+public class Assert {
+  /**
+   * Asserts that a condition is true. If it isn't it throws an
+   * {@link AssertionError} with the given message.
+   *
+   * @param message   the identifying message for the {@link AssertionError}
+   *                  (<code>null</code>
+   *                  okay)
+   * @param condition condition to be checked
+   */
+  static public void assertTrue(String message, boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is true. If it isn't it throws an
+   * {@link AssertionError} without a message.
+   *
+   * @param condition condition to be checked
+   */
+  static public void assertTrue(boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is false. If it isn't it throws an
+   * {@link AssertionError} with the given message.
+   *
+   * @param message   the identifying message for the {@link AssertionError}
+   *                  (<code>null</code>
+   *                  okay)
+   * @param condition condition to be checked
+   */
+  static public void assertFalse(String message, boolean condition) {
+    return;
+  }
+
+  /**
+   * Asserts that a condition is false. If it isn't it throws an
+   * {@link AssertionError} without a message.
+   *
+   * @param condition condition to be checked
+   */
+  static public void assertFalse(boolean condition) {
+    return;
+  }
+
+  /**
+   * Fails a test with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @see AssertionError
+   */
+  static public void fail(String message) {
+    if (message == null) {
+      throw new AssertionError();
+    }
+    throw new AssertionError(message);
+  }
+
+  /**
+   * Asserts that an object isn't null. If it is an {@link AssertionError} is
+   * thrown with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @param object  Object to check or <code>null</code>
+   */
+  static public void assertNotNull(String message, Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object isn't null. If it is an {@link AssertionError} is
+   * thrown.
+   *
+   * @param object Object to check or <code>null</code>
+   */
+  static public void assertNotNull(Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object is null. If it is not, an {@link AssertionError}
+   * is thrown with the given message.
+   *
+   * @param message the identifying message for the {@link AssertionError}
+   *                (<code>null</code>
+   *                okay)
+   * @param object  Object to check or <code>null</code>
+   */
+  static public void assertNull(String message, Object object) {
+    return;
+  }
+
+  /**
+   * Asserts that an object is null. If it isn't an {@link AssertionError} is
+   * thrown.
+   *
+   * @param object Object to check or <code>null</code>
+   */
+  static public void assertNull(Object object) {
+    return;
+  }
+
+  private static boolean equalsRegardingNull(Object expected, Object actual) {
+    if (expected == null) {
+      return actual == null;
+    }
+
+    return isEquals(expected, actual);
+  }
+
+  private static boolean isEquals(Object expected, Object actual) {
+    return expected.equals(actual);
+  }
+
+  /**
+   * Asserts that two doubles are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown with the given
+   * message. If the expected value is infinity then the delta value is
+   * ignored. NaNs are considered equal:
+   * <code>assertEquals(Double.NaN, Double.NaN, *)</code> passes
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(String message, double expected,
+      double actual, double delta) {
+    return;
+  }
+
+  private static void failNotEquals(String message, Object expected,
+      Object actual) {
+    fail(format(message, expected, actual));
+  }
+
+  static String format(String message, Object expected, Object actual) {
+    String formatted = "";
+    if (message != null && !"".equals(message)) {
+      formatted = message + " ";
+    }
+    String expectedString = String.valueOf(expected);
+    String actualString = String.valueOf(actual);
+    if (equalsRegardingNull(expectedString, actualString)) {
+      return formatted + "expected: "
+          + formatClassAndValue(expected, expectedString)
+          + " but was: " + formatClassAndValue(actual, actualString);
+    } else {
+      return formatted + "expected:<" + expectedString + "> but was:<"
+          + actualString + ">";
+    }
+  }
+
+  private static String formatClass(Class<?> value) {
+      String className = value.getCanonicalName();
+      return className == null ? value.getName() : className;
+  }
+
+  private static String formatClassAndValue(Object value, String valueString) {
+    String className = value == null ? "null" : value.getClass().getName();
+    return className + "<" + valueString + ">";
+  }
+
+  /**
+   * Asserts that two floats are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown with the given
+   * message. If the expected value is infinity then the delta value is
+   * ignored. NaNs are considered equal:
+   * <code>assertEquals(Float.NaN, Float.NaN, *)</code> passes
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(String message, float expected, float actual,
+      float delta) {
+    if (floatIsDifferent(expected, actual, delta)) {
+      failNotEquals(message, Float.valueOf(expected), Float.valueOf(actual));
+    }
+  }
+
+  private static boolean doubleIsDifferent(double d1, double d2, double delta) {
+    if (Double.compare(d1, d2) == 0) {
+      return false;
+    }
+    if ((Math.abs(d1 - d2) <= delta)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  private static boolean floatIsDifferent(float f1, float f2, float delta) {
+    if (Float.compare(f1, f2) == 0) {
+      return false;
+    }
+    if ((Math.abs(f1 - f2) <= delta)) {
+      return false;
+    }
+
+    return true;
+  }
+
+  /**
+   * Asserts that two longs are equal. If they are not, an
+   * {@link AssertionError} is thrown.
+   *
+   * @param expected expected long value.
+   * @param actual   actual long value
+   */
+  public static void assertEquals(long expected, long actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  /**
+   * Asserts that two longs are equal. If they are not, an
+   * {@link AssertionError} is thrown with the given message.
+   *
+   * @param message  the identifying message for the {@link AssertionError}
+   *                 (<code>null</code>
+   *                 okay)
+   * @param expected long expected value.
+   * @param actual   long actual value
+   */
+  public static void assertEquals(String message, long expected, long actual) {
+    if (expected != actual) {
+      failNotEquals(message, Long.valueOf(expected), Long.valueOf(actual));
+    }
+  }
+
+  /**
+   * @deprecated Use
+   *             <code>assertEquals(double expected, double actual, double
+   * delta)</code> instead
+   */
+  @Deprecated
+  public static void assertEquals(double expected, double actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  /**
+   * @deprecated Use
+   *             <code>assertEquals(String message, double expected, double
+   * actual, double delta)</code> instead
+   */
+  @Deprecated
+  public static void assertEquals(String message, double expected,
+      double actual) {
+    fail("Use assertEquals(expected, actual, delta) to compare " +
+        "floating-point numbers");
+  }
+
+  /**
+   * Asserts that two doubles are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown. If the expected
+   * value is infinity then the delta value is ignored.NaNs are considered
+   * equal: <code>assertEquals(Double.NaN, Double.NaN, *)</code> passes
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(double expected, double actual,
+      double delta) {
+    assertEquals(null, expected, actual, delta);
+  }
+
+  /**
+   * Asserts that two floats are equal to within a positive delta.
+   * If they are not, an {@link AssertionError} is thrown. If the expected
+   * value is infinity then the delta value is ignored. NaNs are considered
+   * equal: <code>assertEquals(Float.NaN, Float.NaN, *)</code> passes
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   * @param delta    the maximum delta between <code>expected</code> and
+   *                 <code>actual</code> for which both numbers are still
+   *                 considered equal.
+   */
+  public static void assertEquals(float expected, float actual, float delta) {
+    assertEquals(null, expected, actual, delta);
+  }
+
+  /**
+   * Asserts that two objects are equal. If they are not, an
+   * {@link AssertionError} without a message is thrown. If
+   * <code>expected</code> and <code>actual</code> are <code>null</code>,
+   * they are considered equal.
+   *
+   * @param expected expected value
+   * @param actual   the value to check against <code>expected</code>
+   */
+  public static void assertEquals(Object expected, Object actual) {
+    assertEquals(null, expected, actual);
+  }
+
+  public static void assertEquals(String message, Object expected,
+      Object actual) {
+  }
+
+  public static void assertNotEquals(String message, Object unexpected, Object actual) {
+    return;
+  }
+
+  public static void assertNotEquals(Object unexpected, Object actual) {
+    assertNotEquals(null, unexpected, actual);
+  }
+
+  public static void assertNotEquals(String message, long unexpected, long actual) {
+    return;
+  }
+
+  public static void assertNotEquals(long unexpected, long actual) {
+    assertNotEquals(null, unexpected, actual);
+  }
+
+  public static void assertNotEquals(String message, double unexpected, double actual, double delta) {
+    return;
+  }
+
+  public static void assertNotEquals(double unexpected, double actual, double delta) {
+    assertNotEquals(null, unexpected, actual, delta);
+  }
+
+  public static void assertNotEquals(String message, float unexpected, float actual, float delta) {
+    return;
+  }
+
+  public static void assertNotEquals(float unexpected, float actual, float delta) {
+    assertNotEquals(null, unexpected, actual, delta);
+  }
+
+  public static void assertNotSame(String message, Object unexpected, Object actual) {
+    return;
+  }
+
+  public static void assertNotSame(Object unexpected, Object actual) {
+    assertNotSame(null, unexpected, actual);
+  }
+
+  public static void assertSame(String message, Object expected, Object actual) {
+    return;
+  }
+
+  public static void assertSame(Object expected, Object actual) {
+    assertSame(null, expected, actual);
+  }
+
+  /**
+   * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+   * executed. If it does, the exception object is returned. If it does not throw an exception, an
+   * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+   * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+   * be obtained by calling {@link AssertionError#getCause}.
+   *
+   * @param expectedThrowable the expected type of the exception
+   * @param runnable       a function that is expected to throw an exception when executed
+   * @return the exception thrown by {@code runnable}
+   * @since 4.13
+   */
+  public static <T extends Throwable> T assertThrows(Class<T> expectedThrowable,
+          ThrowingRunnable runnable) {
+      return assertThrows(null, expectedThrowable, runnable);
+  }
+
+  /**
+   * Asserts that {@code runnable} throws an exception of type {@code expectedThrowable} when
+   * executed. If it does, the exception object is returned. If it does not throw an exception, an
+   * {@link AssertionError} is thrown. If it throws the wrong type of exception, an {@code
+   * AssertionError} is thrown describing the mismatch; the exception that was actually thrown can
+   * be obtained by calling {@link AssertionError#getCause}.
+   *
+   * @param message the identifying message for the {@link AssertionError} (<code>null</code>
+   * okay)
+   * @param expectedThrowable the expected type of the exception
+   * @param runnable a function that is expected to throw an exception when executed
+   * @return the exception thrown by {@code runnable}
+   * @since 4.13
+   */
+  public static <T extends Throwable> T assertThrows(String message, Class<T> expectedThrowable,
+          ThrowingRunnable runnable) {
+      try {
+          runnable.run();
+      } catch (Throwable actualThrown) {
+          if (expectedThrowable.isInstance(actualThrown)) {
+              @SuppressWarnings("unchecked") T retVal = (T) actualThrown;
+              return retVal;
+          } else {
+              String expected = formatClass(expectedThrowable);
+              Class<? extends Throwable> actualThrowable = actualThrown.getClass();
+              String actual = formatClass(actualThrowable);
+              if (expected.equals(actual)) {
+                  // There must be multiple class loaders. Add the identity hash code so the message
+                  // doesn't say "expected: java.lang.String<my.package.MyException> ..."
+                  expected += "@" + Integer.toHexString(System.identityHashCode(expectedThrowable));
+                  actual += "@" + Integer.toHexString(System.identityHashCode(actualThrowable));
+              }
+              String mismatchMessage = buildPrefix(message)
+                      + format("unexpected exception type thrown;", expected, actual);
+
+              // The AssertionError(String, Throwable) ctor is only available on JDK7.
+              AssertionError assertionError = new AssertionError(mismatchMessage);
+              assertionError.initCause(actualThrown);
+              throw assertionError;
+          }
+      }
+      String notThrownMessage = buildPrefix(message) + String
+              .format("expected %s to be thrown, but nothing was thrown",
+                      formatClass(expectedThrowable));
+      throw new AssertionError(notThrownMessage);
+  }
+
+  private static String buildPrefix(String message) {
+      return message != null && message.length() != 0 ? message + ": " : "";
+  }
+
+}
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/Test.java b/java/ql/test/stubs/junit-4.13/org/junit/Test.java
new file mode 100644
index 000000000000..8356b546d792
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/Test.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015-2018 the original author or authors.
+ *
+ * All rights reserved. This program and the accompanying materials are
+ * made available under the terms of the Eclipse Public License v2.0 which
+ * accompanies this distribution and is available at
+ *
+ * http://www.eclipse.org/legal/epl-v20.html
+ */
+
+/*
+ * MODIFIED version of junit-jupiter-api 5.2.0 as available at
+ *   https://search.maven.org/classic/remotecontent?filepath=org/junit/jupiter/junit-jupiter-api/5.2.0/junit-jupiter-api-5.2.0-sources.jar
+ * Only parts of this file have been retained for test purposes.
+ */
+
+package org.junit;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.ANNOTATION_TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+@Documented
+public @interface Test {}
diff --git a/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java b/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java
new file mode 100644
index 000000000000..d0eb782ccd30
--- /dev/null
+++ b/java/ql/test/stubs/junit-4.13/org/junit/function/ThrowingRunnable.java
@@ -0,0 +1,14 @@
+package org.junit.function;
+
+/**
+ * This interface facilitates the use of
+ * {@link org.junit.Assert#assertThrows(Class, ThrowingRunnable)} from Java 8. It allows method
+ * references to void methods (that declare checked exceptions) to be passed directly into
+ * {@code assertThrows}
+ * without wrapping. It is not meant to be implemented directly.
+ *
+ * @since 4.13
+ */
+public interface ThrowingRunnable {
+    void run() throws Throwable;
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java b/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java
new file mode 100644
index 000000000000..84004de2ac3d
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/ArgumentMatchers.java
@@ -0,0 +1,4 @@
+package org.mockito;
+
+public class ArgumentMatchers {
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java b/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java
new file mode 100644
index 000000000000..f6e46d610e71
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/MockSettings.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito;
+
+import java.io.Serializable;
+
+public interface MockSettings extends Serializable {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java b/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java
new file mode 100644
index 000000000000..e4d5a06a247c
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/Mockito.java
@@ -0,0 +1,216 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito;
+
+import org.mockito.ArgumentMatchers;
+import org.mockito.MockSettings;
+import org.mockito.internal.creation.MockSettingsImpl;
+import org.mockito.stubbing.Answer;
+import org.mockito.stubbing.OngoingStubbing;
+import org.mockito.internal.MockitoCore;
+import org.mockito.MockSettings;
+import org.mockito.stubbing.Stubber;
+
+public class Mockito extends ArgumentMatchers {
+  static final MockitoCore MOCKITO_CORE = new MockitoCore();
+
+  public static MockSettings withSettings() {
+    return new MockSettings() {
+    };
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param reified don't pass any values to it. It's a trick to detect the
+   *                class/interface you
+   *                want to mock.
+   * @return the mock object.
+   * @since 4.10.0
+   */
+  @SafeVarargs
+  public static <T> T mock(T... reified) {
+    return mock(withSettings(), reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * default answer.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param defaultAnswer the default answer to use.
+   * @param reified       don't pass any values to it. It's a trick to detect the
+   *                      class/interface you
+   *                      want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(@SuppressWarnings("rawtypes") Answer defaultAnswer, T... reified) {
+    return mock(new Answer<T>() {
+    }, reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * name.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param name    the mock name to use.
+   * @param reified don't pass any values to it. It's a trick to detect the
+   *                class/interface you
+   *                want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(String name, T... reified) {
+    return mock(withSettings(), reified);
+  }
+
+  /**
+   * Creates a mock object of the requested class or interface with the given
+   * settings.
+   * <p>
+   * See examples in javadoc for the {@link Mockito} class.
+   *
+   * @param settings the mock settings to use.
+   * @param reified  don't pass any values to it. It's a trick to detect the
+   *                 class/interface you
+   *                 want to mock.
+   * @return the mock object.
+   * @since 5.1.0
+   */
+  @SafeVarargs
+  public static <T> T mock(MockSettings settings, T... reified) {
+    if (reified == null || reified.length > 0) {
+      throw new IllegalArgumentException(
+          "Please don't pass any values here. Java will detect class automagically.");
+    }
+
+    return mock(getClassOf(reified), settings);
+  }
+
+  /**
+   * Creates mock object of given class or interface.
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock class or interface to mock
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock) {
+    return mock(classToMock, withSettings());
+  }
+
+  /**
+   * Specifies mock name. Naming mocks can be helpful for debugging - the name is
+   * used in all verification errors.
+   * <p>
+   * Beware that naming mocks is not a solution for complex code which uses too
+   * many mocks or collaborators.
+   * <b>If you have too many mocks then refactor the code</b> so that it's easy to
+   * test/debug without necessity of naming mocks.
+   * <p>
+   * <b>If you use <code>&#064;Mock</code> annotation then you've got naming mocks
+   * for free!</b> <code>&#064;Mock</code> uses field name as mock name.
+   * {@link Mock Read more.}
+   * <p>
+   *
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock class or interface to mock
+   * @param name        of the mock
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, String name) {
+    return mock(classToMock, new Answer<T>() {
+    });
+  }
+
+  /**
+   * Creates mock with a specified strategy for its answers to interactions.
+   * It's quite an advanced feature and typically you don't need it to write
+   * decent tests.
+   * However it can be helpful when working with legacy systems.
+   * <p>
+   * It is the default answer so it will be used <b>only when you don't</b> stub
+   * the method call.
+   *
+   * <pre class="code">
+   * <code class="java">
+   *   Foo mock = mock(Foo.class, RETURNS_SMART_NULLS);
+   *   Foo mockTwo = mock(Foo.class, new YourOwnAnswer());
+   * </code>
+   * </pre>
+   *
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   * </p>
+   *
+   * @param classToMock   class or interface to mock
+   * @param defaultAnswer default answer for un-stubbed methods
+   *
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, Answer defaultAnswer) {
+    return mock(classToMock, new Answer<T>() {
+    });
+  }
+
+  /**
+   * Creates a mock with some non-standard settings.
+   * <p>
+   * The number of configuration points for a mock will grow,
+   * so we need a fluent way to introduce new configuration without adding more
+   * and more overloaded Mockito.mock() methods.
+   * Hence {@link MockSettings}.
+   * 
+   * <pre class="code">
+   * <code class="java">
+   *   Listener mock = mock(Listener.class, withSettings()
+   *     .name("firstListner").defaultBehavior(RETURNS_SMART_NULLS));
+   *   );
+   * </code>
+   * </pre>
+   * 
+   * <b>Use it carefully and occasionally</b>. What might be reason your test
+   * needs non-standard mocks?
+   * Is the code under test so complicated that it requires non-standard mocks?
+   * Wouldn't you prefer to refactor the code under test, so that it is testable
+   * in a simple way?
+   * <p>
+   * See also {@link Mockito#withSettings()}
+   * <p>
+   * See examples in javadoc for {@link Mockito} class
+   *
+   * @param classToMock  class or interface to mock
+   * @param mockSettings additional mock settings
+   * @return mock object
+   */
+  public static <T> T mock(Class<T> classToMock, MockSettings mockSettings) {
+    return MOCKITO_CORE.mock(classToMock, mockSettings);
+  }
+
+  private static <T> Class<T> getClassOf(T[] array) {
+    return (Class<T>) array.getClass().getComponentType();
+  }
+
+  public static <T> OngoingStubbing<T> when(T methodCall) {
+    return MOCKITO_CORE.when(methodCall);
+  }
+
+  public static Stubber doReturn(Object toBeReturned) {
+    return null;
+  }
+
+  public static Stubber doReturn(Object toBeReturned, Object... toBeReturnedNext) {
+    return null;
+  }
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java
new file mode 100644
index 000000000000..0ae8790a6d37
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/MockitoCore.java
@@ -0,0 +1,28 @@
+package org.mockito.internal;
+
+import org.mockito.MockSettings;
+import org.mockito.internal.creation.MockSettingsImpl;
+import org.mockito.internal.progress.MockingProgress;
+import org.mockito.stubbing.OngoingStubbing;
+import org.mockito.mock.MockCreationSettings;
+import static org.mockito.internal.util.MockUtil.createMock;
+
+public class MockitoCore {
+  public <T> T mock(Class<T> typeToMock, MockSettings settings) {
+    MockSettingsImpl impl = (MockSettingsImpl) settings;
+    MockCreationSettings<T> creationSettings = impl.build(typeToMock);
+    T mock = createMock(creationSettings);
+    return mock;
+  }
+
+  public <T> OngoingStubbing<T> when(T methodCall) {
+    MockingProgress mockingProgress = new MockingProgress() {
+      @Override
+      public OngoingStubbing<?> pullOngoingStubbing() {
+        return null;
+      }
+    };
+    OngoingStubbing<T> stubbing = (OngoingStubbing<T>) mockingProgress.pullOngoingStubbing();
+    return stubbing;
+  }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java
new file mode 100644
index 000000000000..c1e9083f4de8
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/creation/MockSettingsImpl.java
@@ -0,0 +1,14 @@
+package org.mockito.internal.creation;
+
+import org.mockito.MockSettings;
+import org.mockito.mock.MockCreationSettings;
+
+public class MockSettingsImpl<T> implements MockSettings {
+  public <T2> MockCreationSettings<T2> build(Class<T2> typeToMock) {
+    return new MockCreationSettings<T2>() {
+      public String getMockMaker() {
+        return null;
+      }
+    };
+  }
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java
new file mode 100644
index 000000000000..17dc3dcd618e
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerFactory.java
@@ -0,0 +1,14 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.handler;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.invocation.MockHandler;
+
+public final class MockHandlerFactory {
+    public static <T> MockHandler<T> createMockHandler(MockCreationSettings<T> settings) {
+        return new MockHandlerImpl<T>();
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java
new file mode 100644
index 000000000000..dd1dfc68dc37
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/handler/MockHandlerImpl.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.handler;
+
+import org.mockito.invocation.MockHandler;
+
+public class MockHandlerImpl<T> implements MockHandler<T> {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java
new file mode 100644
index 000000000000..d52a9631b68b
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/progress/MockingProgress.java
@@ -0,0 +1,11 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.internal.progress;
+
+import org.mockito.stubbing.OngoingStubbing;
+
+public interface MockingProgress {
+  OngoingStubbing<?> pullOngoingStubbing();
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java
new file mode 100644
index 000000000000..8a975ffe1194
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/internal/util/MockUtil.java
@@ -0,0 +1,18 @@
+package org.mockito.internal.util;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.plugins.MockMaker;
+import org.mockito.invocation.MockHandler;
+import static org.mockito.internal.handler.MockHandlerFactory.createMockHandler;
+
+public class MockUtil {
+    public static <T> T createMock(MockCreationSettings<T> settings) {
+        MockMaker mockMaker = getMockMaker(settings.getMockMaker());
+        MockHandler mockHandler = createMockHandler(settings);
+        return mockMaker.createMock(settings, mockHandler);
+    }
+
+    public static MockMaker getMockMaker(String mockMaker) {
+        return null;
+    }
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java b/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java
new file mode 100644
index 000000000000..d667c3759294
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/invocation/MockHandler.java
@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.invocation;
+
+import java.io.Serializable;
+
+public interface MockHandler<T> extends Serializable {
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java b/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java
new file mode 100644
index 000000000000..86788eda5f12
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/mock/MockCreationSettings.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.mock;
+
+public interface MockCreationSettings<T> {
+  String getMockMaker();
+}
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java b/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java
new file mode 100644
index 000000000000..d7b06ab96f5e
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/plugins/MockMaker.java
@@ -0,0 +1,8 @@
+package org.mockito.plugins;
+
+import org.mockito.mock.MockCreationSettings;
+import org.mockito.invocation.MockHandler;
+
+public interface MockMaker {
+  <T> T createMock(MockCreationSettings<T> settings, MockHandler handler);
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java
new file mode 100644
index 000000000000..60828a66c522
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Answer.java
@@ -0,0 +1,7 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.stubbing;
+
+public interface Answer<T> { }
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java
new file mode 100644
index 000000000000..3fb5e659f045
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/OngoingStubbing.java
@@ -0,0 +1,9 @@
+/*
+ * Copyright (c) 2007 Mockito contributors
+ * This program is made available under the terms of the MIT License.
+ */
+package org.mockito.stubbing;
+
+public interface OngoingStubbing<T> {
+  OngoingStubbing<T> thenReturn(T value);
+}
\ No newline at end of file
diff --git a/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java
new file mode 100644
index 000000000000..eccca0c2c38c
--- /dev/null
+++ b/java/ql/test/stubs/mockito-5.14/org/mockito/stubbing/Stubber.java
@@ -0,0 +1,5 @@
+package org.mockito.stubbing;
+
+public interface Stubber {
+  <T> T when(T mock);
+}
\ No newline at end of file
diff --git a/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
new file mode 100644
index 000000000000..76a926a00d5f
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/old.dbscheme
@@ -0,0 +1,1204 @@
+/*** 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..ccefb5e2d493
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/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/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
new file mode 100644
index 000000000000..bae98029d4bf
--- /dev/null
+++ b/javascript/downgrades/76a926a00d5f3bc199c203a1437796fd7b2835ba/upgrade.properties
@@ -0,0 +1,5 @@
+description: downgrade overlay relations
+compatibility: full
+
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
index 08dac06c4d94..f5e998398f52 100644
--- a/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
+++ b/javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
@@ -465,10 +465,11 @@ public int run() throws IOException {
       try {
         CompletableFuture<?> sourceFuture = extractSource();
         sourceFuture.join(); // wait for source extraction to complete
-        if (hasSeenCode()) { // don't bother with the externs if no code was seen
+        if (hasSeenCode() && !isOverlayChangeMode()) { // don't bother with the externs if no code was seen or in overlay change mode
           extractExterns();
         }
         extractXml();
+        writeOverlayMetadata();
       } catch (OutOfMemoryError oom) {
         System.err.println("Out of memory while extracting the project.");
         return 137; // the CodeQL CLI will interpret this as an out-of-memory error
@@ -509,6 +510,21 @@ public int run() throws IOException {
     return 0;
   }
 
+  private void writeOverlayMetadata() {
+    String file = getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_BASE_METADATA_OUT");
+    if (file == null) {
+      // no overlay metadata file specified, so nothing to do
+      return;
+    }
+    // Write an empty string to the file as we currently have no metadata to emit.
+    // The file must be created for the database to recognized as an overlay base.
+    try {
+      Files.writeString(Paths.get(file), "", StandardCharsets.UTF_8);
+    } catch (IOException e) {
+      throw new ResourceError("Could not write overlay metadata to " + file, e);
+    }
+  }
+
   /**
    * A kind of error that can happen during extraction of JavaScript or TypeScript
    * code.
@@ -734,6 +750,17 @@ private CompletableFuture<?> extractSource() throws IOException {
     List<Path> tsconfigFiles = new ArrayList<>();
     findFilesToExtract(defaultExtractor, filesToExtract, tsconfigFiles);
 
+    OverlayChanges overlay = getOverlayChanges();
+    if (overlay != null) {
+      Set<Path> changedFiles = overlay.changes.stream()
+          .map(file -> Paths.get(file).toAbsolutePath())
+          .collect(Collectors.toSet());
+      int before = filesToExtract.size();
+      filesToExtract.retainAll(changedFiles);
+      int after = filesToExtract.size();
+      System.out.println("Overlay filter removed " + (before - after) + " out of " + before + " files from extraction.");
+    }
+
     tsconfigFiles = tsconfigFiles.stream()
          .sorted(PATH_ORDERING)
          .collect(Collectors.toList());
@@ -1338,6 +1365,18 @@ protected void extractXml() throws IOException {
     }
   }
 
+  private boolean isOverlayChangeMode() {
+    return getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_CHANGES") != null;
+  }
+
+  private OverlayChanges getOverlayChanges() throws IOException {
+    String jsonFile = getEnvVar("CODEQL_EXTRACTOR_JAVASCRIPT_OVERLAY_CHANGES");
+    if (jsonFile == null) {
+      return null;
+    }
+    return new Gson().fromJson(Files.newBufferedReader(Paths.get(jsonFile)), OverlayChanges.class);
+  }
+
   public static void main(String[] args) {
     try {
       System.exit(new AutoBuild().run());
diff --git a/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java b/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java
new file mode 100644
index 000000000000..25cae238920b
--- /dev/null
+++ b/javascript/extractor/src/com/semmle/js/extractor/OverlayChanges.java
@@ -0,0 +1,7 @@
+package com.semmle.js.extractor;
+
+import java.util.List;
+
+public class OverlayChanges {
+    public List<String> changes;
+}
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 3604e77c13b7..d45d55f6a36f 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.6.10
+
+### Minor Analysis Improvements
+
+* Removed `libxmljs` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/GNOME/libxml2/blob/0c948334a8f5c66d50e9f8992e62998017dc4fc6/NEWS#L905-L908) that prevents XML bomb attacks.
+
 ## 2.6.9
 
 ### Minor Analysis Improvements
diff --git a/javascript/ql/lib/change-notes/released/2.6.10.md b/javascript/ql/lib/change-notes/released/2.6.10.md
new file mode 100644
index 000000000000..7b9859668cbc
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.6.10.md
@@ -0,0 +1,5 @@
+## 2.6.10
+
+### Minor Analysis Improvements
+
+* Removed `libxmljs` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/GNOME/libxml2/blob/0c948334a8f5c66d50e9f8992e62998017dc4fc6/NEWS#L905-L908) that prevents XML bomb attacks.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 8bec0b26cea1..aa42bd9f12ad 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.6.9
+lastReleaseVersion: 2.6.10
diff --git a/javascript/ql/lib/javascript.qll b/javascript/ql/lib/javascript.qll
index 88e46c77453b..ad9cfe009b51 100644
--- a/javascript/ql/lib/javascript.qll
+++ b/javascript/ql/lib/javascript.qll
@@ -146,3 +146,4 @@ import semmle.javascript.linters.JSLint
 import semmle.javascript.linters.Linting
 import semmle.javascript.security.dataflow.RemoteFlowSources
 import semmle.javascript.frameworks.UnderscoreDotString
+private import semmle.javascript.internal.Overlay
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 9c9850454f21..f4d61d54235b 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.6.9
+version: 2.6.10
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/lib/semmle/javascript/AST.qll b/javascript/ql/lib/semmle/javascript/AST.qll
index bcde7bbaf4a2..db0a2e153d50 100644
--- a/javascript/ql/lib/semmle/javascript/AST.qll
+++ b/javascript/ql/lib/semmle/javascript/AST.qll
@@ -31,7 +31,7 @@ class AstNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the first token belonging to this element. */
   Token getFirstToken() {
-    exists(DbLocation l1, DbLocation l2, string filepath, int startline, int startcolumn |
+    exists(Location l1, Location l2, string filepath, int startline, int startcolumn |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.hasLocationInfo(filepath, startline, startcolumn, _, _) and
@@ -41,7 +41,7 @@ class AstNode extends @ast_node, NodeInStmtContainer {
 
   /** Gets the last token belonging to this element. */
   Token getLastToken() {
-    exists(DbLocation l1, DbLocation l2, string filepath, int endline, int endcolumn |
+    exists(Location l1, Location l2, string filepath, int endline, int endcolumn |
       l1 = this.getLocation() and
       l2 = result.getLocation() and
       l1.hasLocationInfo(filepath, _, _, endline, endcolumn) and
diff --git a/javascript/ql/lib/semmle/javascript/Files.qll b/javascript/ql/lib/semmle/javascript/Files.qll
index e717eb6def41..b9274d92ebaa 100644
--- a/javascript/ql/lib/semmle/javascript/Files.qll
+++ b/javascript/ql/lib/semmle/javascript/Files.qll
@@ -3,7 +3,6 @@
 import javascript
 private import NodeModuleResolutionImpl
 private import codeql.util.FileSystem
-private import internal.Locations
 
 private module FsInput implements InputSig {
   abstract class ContainerBase extends @container {
@@ -99,7 +98,7 @@ class File extends Container, Impl::File {
    *
    * Note that files have special locations starting and ending at line zero, column zero.
    */
-  DbLocation getLocation() { result = getLocatableLocation(this) }
+  Location getLocation() { hasLocation(this, result) }
 
   /** Gets the number of lines in this file. */
   int getNumberOfLines() { result = sum(int loc | numlines(this, loc, _, _) | loc) }
diff --git a/javascript/ql/lib/semmle/javascript/JSON.qll b/javascript/ql/lib/semmle/javascript/JSON.qll
index 714228e52b65..19fc3ec84d7a 100644
--- a/javascript/ql/lib/semmle/javascript/JSON.qll
+++ b/javascript/ql/lib/semmle/javascript/JSON.qll
@@ -3,7 +3,6 @@
  */
 
 import javascript
-private import semmle.javascript.internal.Locations
 
 /**
  * A JSON-encoded value, which may be a primitive value, an array or an object.
@@ -33,7 +32,7 @@ class JsonValue extends @json_value, Locatable {
   override string toString() { json(this, _, _, _, result) }
 
   /** Gets the JSON file containing this value. */
-  File getJsonFile() { result = getLocatableLocation(this).getFile() }
+  File getJsonFile() { exists(Location loc | json_locations(this, loc) and result = loc.getFile()) }
 
   /** If this is an object, gets the value of property `name`. */
   JsonValue getPropValue(string name) { json_properties(this, name, result) }
diff --git a/javascript/ql/lib/semmle/javascript/Locations.qll b/javascript/ql/lib/semmle/javascript/Locations.qll
index ce323dfc14db..a3ad79ef93ea 100644
--- a/javascript/ql/lib/semmle/javascript/Locations.qll
+++ b/javascript/ql/lib/semmle/javascript/Locations.qll
@@ -1,7 +1,6 @@
 /** Provides classes for working with locations and program elements that have locations. */
 
 import javascript
-private import internal.Locations
 
 /**
  * A location as given by a file, a start line, a start column,
@@ -11,31 +10,31 @@ private import internal.Locations
  *
  * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
  */
-class DbLocation extends TDbLocation {
+final class Location extends @location_default {
   /** Gets the file for this location. */
-  File getFile() { dbLocationInfo(this, result, _, _, _, _) }
+  File getFile() { locations_default(this, result, _, _, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location starts. */
-  int getStartLine() { dbLocationInfo(this, _, result, _, _, _) }
+  int getStartLine() { locations_default(this, _, result, _, _, _) }
 
   /** Gets the 1-based column number (inclusive) where this location starts. */
-  int getStartColumn() { dbLocationInfo(this, _, _, result, _, _) }
+  int getStartColumn() { locations_default(this, _, _, result, _, _) }
 
   /** Gets the 1-based line number (inclusive) where this location ends. */
-  int getEndLine() { dbLocationInfo(this, _, _, _, result, _) }
+  int getEndLine() { locations_default(this, _, _, _, result, _) }
 
   /** Gets the 1-based column number (inclusive) where this location ends. */
-  int getEndColumn() { dbLocationInfo(this, _, _, _, _, result) }
+  int getEndColumn() { locations_default(this, _, _, _, _, result) }
 
   /** Gets the number of lines covered by this location. */
   int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
 
   /** Holds if this location starts before location `that`. */
   pragma[inline]
-  predicate startsBefore(DbLocation that) {
-    exists(File f, int sl1, int sc1, int sl2, int sc2 |
-      dbLocationInfo(this, f, sl1, sc1, _, _) and
-      dbLocationInfo(that, f, sl2, sc2, _, _)
+  predicate startsBefore(Location that) {
+    exists(string f, int sl1, int sc1, int sl2, int sc2 |
+      this.hasLocationInfo(f, sl1, sc1, _, _) and
+      that.hasLocationInfo(f, sl2, sc2, _, _)
     |
       sl1 < sl2
       or
@@ -45,10 +44,10 @@ class DbLocation extends TDbLocation {
 
   /** Holds if this location ends after location `that`. */
   pragma[inline]
-  predicate endsAfter(DbLocation that) {
-    exists(File f, int el1, int ec1, int el2, int ec2 |
-      dbLocationInfo(this, f, _, _, el1, ec1) and
-      dbLocationInfo(that, f, _, _, el2, ec2)
+  predicate endsAfter(Location that) {
+    exists(string f, int el1, int ec1, int el2, int ec2 |
+      this.hasLocationInfo(f, _, _, el1, ec1) and
+      that.hasLocationInfo(f, _, _, el2, ec2)
     |
       el1 > el2
       or
@@ -60,10 +59,10 @@ class DbLocation extends TDbLocation {
    * Holds if this location contains location `that`, meaning that it starts
    * before and ends after it.
    */
-  predicate contains(DbLocation that) { this.startsBefore(that) and this.endsAfter(that) }
+  predicate contains(Location that) { this.startsBefore(that) and this.endsAfter(that) }
 
   /** Holds if this location is empty. */
-  predicate isEmpty() { exists(int l, int c | dbLocationInfo(this, _, l, c, l, c - 1)) }
+  predicate isEmpty() { exists(int l, int c | this.hasLocationInfo(_, l, c, l, c - 1)) }
 
   /** Gets a textual representation of this element. */
   string toString() { result = this.getFile().getBaseName() + ":" + this.getStartLine().toString() }
@@ -79,13 +78,19 @@ class DbLocation extends TDbLocation {
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     exists(File f |
-      dbLocationInfo(this, f, startline, startcolumn, endline, endcolumn) and
+      locations_default(this, f, startline, startcolumn, endline, endcolumn) and
       filepath = f.getAbsolutePath()
     )
   }
 }
 
-final class Location = LocationImpl;
+cached
+private Location getLocatableLocation(@locatable l) {
+  hasLocation(l, result) or
+  xmllocations(l, result) or
+  json_locations(l, result) or
+  yaml_locations(l, result)
+}
 
 /** A program element with a location. */
 class Locatable extends @locatable {
@@ -93,7 +98,7 @@ class Locatable extends @locatable {
   File getFile() { result = this.getLocation().getFile() }
 
   /** Gets this element's location. */
-  final DbLocation getLocation() { result = getLocatableLocation(this) }
+  final Location getLocation() { result = getLocatableLocation(this) }
 
   /**
    * Gets the line on which this element starts.
@@ -144,3 +149,8 @@ class Locatable extends @locatable {
    */
   string getAPrimaryQlClass() { result = "???" }
 }
+
+/**
+ * DEPRECATED. Use `Location` instead.
+ */
+deprecated class DbLocation = Location;
diff --git a/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll b/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
index 05bcd8b3dddc..47ee41a42357 100644
--- a/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
+++ b/javascript/ql/lib/semmle/javascript/RestrictedLocations.qll
@@ -26,7 +26,7 @@ class FirstLineOf extends Locatable {
       then endcolumn = xc
       else
         endcolumn =
-          max(int c | any(DbLocation l).hasLocationInfo(filepath, startline, _, startline, c))
+          max(int c | any(Location l).hasLocationInfo(filepath, startline, _, startline, c))
     )
   }
 }
diff --git a/javascript/ql/lib/semmle/javascript/SSA.qll b/javascript/ql/lib/semmle/javascript/SSA.qll
index 2de42193743f..a2c5bf1d34e6 100644
--- a/javascript/ql/lib/semmle/javascript/SSA.qll
+++ b/javascript/ql/lib/semmle/javascript/SSA.qll
@@ -108,8 +108,8 @@ private module Internal {
    */
   cached
   newtype TSsaDefinition =
-    TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v) {
-      bb.defAt(i, v, d) and
+    TExplicitDef(ReachableBasicBlock bb, int i, VarDef d, SsaSourceVariable v, VarRef lhs) {
+      bb.defAt(i, v, d, lhs) and
       (
         liveAfterDef(bb, i, v) or
         v.isCaptured()
@@ -412,17 +412,22 @@ class SsaVariable extends TSsaDefinition {
   /** Gets a textual representation of this element. */
   string toString() { result = this.getDefinition().prettyPrintRef() }
 
+  /** Gets the location of this SSA variable. */
+  Location getLocation() { result = this.getDefinition().getLocation() }
+
   /**
+   * DEPRECATED. Use `getLocation().hasLocationInfo()` instead.
+   *
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
    * column `endcolumn` of line `endline` in file `filepath`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
-    this.getDefinition().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
   }
 }
 
@@ -478,23 +483,22 @@ class SsaDefinition extends TSsaDefinition {
   string toString() { result = this.prettyPrintDef() }
 
   /**
+   * DEPRECATED. Use `getLocation().hasLocationInfo()` instead.
+   *
    * Holds if this element is at the specified location.
    * The location spans column `startcolumn` of line `startline` to
    * column `endcolumn` of line `endline` in file `filepath`.
    * For more information, see
    * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
    */
-  abstract predicate hasLocationInfo(
+  deprecated predicate hasLocationInfo(
     string filepath, int startline, int startcolumn, int endline, int endcolumn
-  );
+  ) {
+    this.getLocation().hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
+  }
 
   /** Gets the location of this element. */
-  final Location getLocation() {
-    exists(string filepath, int startline, int startcolumn, int endline, int endcolumn |
-      this.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-      result.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
+  Location getLocation() { result = this.getBasicBlock().getLocation() }
 
   /** Gets the function or toplevel to which this definition belongs. */
   StmtContainer getContainer() { result = this.getBasicBlock().getContainer() }
@@ -505,36 +509,34 @@ class SsaDefinition extends TSsaDefinition {
  */
 class SsaExplicitDefinition extends SsaDefinition, TExplicitDef {
   override predicate definesAt(ReachableBasicBlock bb, int i, SsaSourceVariable v) {
-    this = TExplicitDef(bb, i, _, v)
+    this = TExplicitDef(bb, i, _, v, _)
   }
 
   /** This SSA definition corresponds to the definition of `v` at `def`. */
-  predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v) }
+  predicate defines(VarDef def, SsaSourceVariable v) { this = TExplicitDef(_, _, def, v, _) }
 
   /** Gets the variable definition wrapped by this SSA definition. */
-  VarDef getDef() { this = TExplicitDef(_, _, result, _) }
+  VarDef getDef() { this = TExplicitDef(_, _, result, _, _) }
+
+  /** Gets the variable reference appearing on the left-hand side of this assignment. */
+  VarRef getLhs() { this = TExplicitDef(_, _, _, _, result) }
 
   /** Gets the basic block to which this definition belongs. */
   override ReachableBasicBlock getBasicBlock() { this.definesAt(result, _, _) }
 
-  override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result) }
+  override SsaSourceVariable getSourceVariable() { this = TExplicitDef(_, _, _, result, _) }
 
   override VarDef getAContributingVarDef() { result = this.getDef() }
 
   override string prettyPrintRef() {
-    exists(int l, int c | this.hasLocationInfo(_, l, c, _, _) | result = "def@" + l + ":" + c)
+    exists(int l, int c | this.getLocation().hasLocationInfo(_, l, c, _, _) |
+      result = "def@" + l + ":" + c
+    )
   }
 
   override string prettyPrintDef() { result = this.getDef().toString() }
 
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(Location loc |
-      pragma[only_bind_into](loc) = pragma[only_bind_into](this.getDef()).getLocation() and
-      loc.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
+  override Location getLocation() { result = this.getLhs().getLocation() }
 
   /**
    * Gets the data flow node representing the incoming value assigned at this definition,
@@ -557,21 +559,10 @@ abstract class SsaImplicitDefinition extends SsaDefinition {
   abstract string getKind();
 
   override string prettyPrintRef() {
-    exists(int l, int c | this.hasLocationInfo(_, l, c, _, _) |
+    exists(int l, int c | this.getLocation().hasLocationInfo(_, l, c, _, _) |
       result = this.getKind() + "@" + l + ":" + c
     )
   }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    endline = startline and
-    endcolumn = startcolumn and
-    exists(Location loc |
-      pragma[only_bind_into](loc) = pragma[only_bind_into](this.getBasicBlock()).getLocation() and
-      loc.hasLocationInfo(filepath, startline, startcolumn, _, _)
-    )
-  }
 }
 
 /**
@@ -617,16 +608,6 @@ class SsaVariableCapture extends SsaImplicitDefinition, TCapture {
   override string getKind() { result = "capture" }
 
   override string prettyPrintDef() { result = "capture variable " + this.getSourceVariable() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(ReachableBasicBlock bb, int i | this.definesAt(bb, i, _) |
-      bb.getNode(i)
-          .getLocation()
-          .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-    )
-  }
 }
 
 /**
@@ -747,13 +728,7 @@ class SsaRefinementNode extends SsaPseudoDefinition, TRefinement {
       this.getSourceVariable() + " = refine[" + this.getGuard() + "](" + this.ppInputs() + ")"
   }
 
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    this.getGuard()
-        .getLocation()
-        .hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
+  override Location getLocation() { result = this.getGuard().getLocation() }
 }
 
 module Ssa {
diff --git a/javascript/ql/lib/semmle/javascript/Variables.qll b/javascript/ql/lib/semmle/javascript/Variables.qll
index 2f9905f86e17..adc0ad5b9c87 100644
--- a/javascript/ql/lib/semmle/javascript/Variables.qll
+++ b/javascript/ql/lib/semmle/javascript/Variables.qll
@@ -353,9 +353,9 @@ class LocalVariable extends Variable {
    * If the variable has one or more declarations, the location of the first declaration is used.
    * If the variable has no declaration, the entry point of its declaring container is used.
    */
-  DbLocation getLocation() {
+  Location getLocation() {
     result =
-      min(DbLocation loc |
+      min(Location loc |
         loc = this.getADeclaration().getLocation()
       |
         loc order by loc.getStartLine(), loc.getStartColumn()
diff --git a/javascript/ql/lib/semmle/javascript/XML.qll b/javascript/ql/lib/semmle/javascript/XML.qll
index 2a351016fd14..54157809260b 100644
--- a/javascript/ql/lib/semmle/javascript/XML.qll
+++ b/javascript/ql/lib/semmle/javascript/XML.qll
@@ -3,13 +3,12 @@
  */
 
 import semmle.files.FileSystem
-private import semmle.javascript.internal.Locations
 private import codeql.xml.Xml
 
-private module Input implements InputSig<File, DbLocation> {
+private module Input implements InputSig<File, Location> {
   class XmlLocatableBase = @xmllocatable or @xmlnamespaceable;
 
-  predicate xmllocations_(XmlLocatableBase e, DbLocation loc) { loc = getLocatableLocation(e) }
+  predicate xmllocations_(XmlLocatableBase e, Location loc) { xmllocations(e, loc) }
 
   class XmlParentBase = @xmlparent;
 
@@ -67,4 +66,4 @@ private module Input implements InputSig<File, DbLocation> {
   }
 }
 
-import Make<File, DbLocation, Input>
+import Make<File, Location, Input>
diff --git a/javascript/ql/lib/semmle/javascript/YAML.qll b/javascript/ql/lib/semmle/javascript/YAML.qll
index 24486b729c04..a312d78b6fbe 100644
--- a/javascript/ql/lib/semmle/javascript/YAML.qll
+++ b/javascript/ql/lib/semmle/javascript/YAML.qll
@@ -9,8 +9,6 @@ import javascript
 private import codeql.yaml.Yaml as LibYaml
 
 private module YamlSig implements LibYaml::InputSig {
-  class Location = DbLocation;
-
   class LocatableBase extends @yaml_locatable, Locatable { }
 
   import javascript
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
index 75f21bab38ac..9e49b41052ee 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableCapture.qll
@@ -4,7 +4,7 @@ private import semmle.javascript.dataflow.internal.VariableOrThis
 private import codeql.dataflow.VariableCapture
 private import semmle.javascript.dataflow.internal.sharedlib.DataFlowImplCommon as DataFlowImplCommon
 
-module VariableCaptureConfig implements InputSig<js::DbLocation> {
+module VariableCaptureConfig implements InputSig<js::Location, js::Cfg::BasicBlock> {
   private js::Function getLambdaFromVariable(js::LocalVariable variable) {
     result.getVariable() = variable
     or
@@ -106,10 +106,8 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     )
   }
 
-  class ControlFlowNode = js::ControlFlowNode;
-
-  class BasicBlock extends js::BasicBlock {
-    Callable getEnclosingCallable() { result = this.getContainer().getFunctionBoundary() }
+  Callable basicBlockGetEnclosingCallable(js::Cfg::BasicBlock bb) {
+    result = bb.getContainer().getFunctionBoundary()
   }
 
   class Callable extends js::StmtContainer {
@@ -125,7 +123,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
   class Expr extends js::AST::ValueNode {
     /** Holds if the `i`th node of basic block `bb` evaluates this expression. */
-    predicate hasCfgNode(BasicBlock bb, int i) {
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       // Note: this is overridden for FunctionDeclStmt
       bb.getNode(i) = this
     }
@@ -168,9 +166,9 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
     string toString() { none() } // Overridden in subclass
 
-    js::DbLocation getLocation() { none() } // Overridden in subclass
+    js::Location getLocation() { none() } // Overridden in subclass
 
-    predicate hasCfgNode(BasicBlock bb, int i) { none() } // Overridden in subclass
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) { none() } // Overridden in subclass
 
     // note: langauge-specific
     js::DataFlow::Node getSource() { none() } // Overridden in subclass
@@ -186,7 +184,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     override string toString() { result = pattern.toString() }
 
     /** Gets the location of this write. */
-    override js::DbLocation getLocation() { result = pattern.getLocation() }
+    override js::Location getLocation() { result = pattern.getLocation() }
 
     override js::DataFlow::Node getSource() {
       // Note: there is not always an expression corresponding to the RHS of the assignment.
@@ -207,7 +205,7 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
     }
 
     /** Holds if the `i`th node of basic block `bb` evaluates this expression. */
-    override predicate hasCfgNode(BasicBlock bb, int i) {
+    override predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       bb.getNode(i) = this.getCfgNodeOverride()
       or
       not exists(this.getCfgNodeOverride()) and
@@ -222,11 +220,11 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
 
     override string toString() { result = "[implicit init] " + variable }
 
-    override js::DbLocation getLocation() { result = variable.getLocation() }
+    override js::Location getLocation() { result = variable.getLocation() }
 
     override CapturedVariable getVariable() { result = variable }
 
-    override predicate hasCfgNode(BasicBlock bb, int i) {
+    override predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) {
       // 'i' would normally be bound to 0, but we lower it to -1 so FunctionDeclStmts can be evaluated
       // at index 0.
       any(js::SsaImplicitInit def).definesAt(bb, _, variable.asLocalVariable()) and i = -1
@@ -234,15 +232,9 @@ module VariableCaptureConfig implements InputSig<js::DbLocation> {
       bb.(js::EntryBasicBlock).getContainer() = variable.asThisContainer() and i = -1
     }
   }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  predicate entryBlock(BasicBlock bb) { bb instanceof js::EntryBasicBlock }
 }
 
-module VariableCaptureOutput = Flow<js::DbLocation, VariableCaptureConfig>;
+module VariableCaptureOutput = Flow<js::Location, js::Cfg, VariableCaptureConfig>;
 
 js::DataFlow::Node getNodeFromClosureNode(VariableCaptureOutput::ClosureNode node) {
   result = TValueNode(node.(VariableCaptureOutput::ExprNode).getExpr())
@@ -288,9 +280,9 @@ private module Debug {
     relevantContainer(node1.getContainer())
   }
 
-  predicate readBB(VariableRead read, BasicBlock bb, int i) { read.hasCfgNode(bb, i) }
+  predicate readBB(VariableRead read, js::Cfg::BasicBlock bb, int i) { read.hasCfgNode(bb, i) }
 
-  predicate writeBB(VariableWrite write, BasicBlock bb, int i) { write.hasCfgNode(bb, i) }
+  predicate writeBB(VariableWrite write, js::Cfg::BasicBlock bb, int i) { write.hasCfgNode(bb, i) }
 
   int captureDegree(js::Function fun) {
     result = strictcount(CapturedVariable v | captures(fun, v))
diff --git a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
index 8309c0d639c3..a517e0d91fd0 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/VariableOrThis.qll
@@ -25,7 +25,7 @@ class LocalVariableOrThis extends TLocalVariableOrThis {
   }
 
   /** Gets the location of a declaration of this variable, or the declaring container if this is `this`. */
-  DbLocation getLocation() {
+  Location getLocation() {
     result = this.asLocalVariable().getLocation()
     or
     result = this.asThisContainer().getLocation()
@@ -95,7 +95,7 @@ abstract class ThisUse instanceof ControlFlowNode {
   string toString() { result = super.toString() }
 
   /** Gets the location of this use of `this`. */
-  DbLocation getLocation() { result = super.getLocation() }
+  Location getLocation() { result = super.getLocation() }
 }
 
 private predicate implicitThisUse(ControlFlowNode node, StmtContainer thisBinder) {
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 eef4dc08318a..7e610c3c23ce 100644
--- a/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
+++ b/javascript/ql/lib/semmle/javascript/dataflow/internal/sharedlib/Ssa.qll
@@ -9,11 +9,7 @@ private import codeql.ssa.Ssa
 private import semmle.javascript.internal.BasicBlockInternal as BasicBlockInternal
 private import semmle.javascript.dataflow.internal.VariableOrThis
 
-module SsaConfig implements InputSig<js::DbLocation> {
-  class ControlFlowNode = js::ControlFlowNode;
-
-  class BasicBlock = js::BasicBlock;
-
+module SsaConfig implements InputSig<js::Location, js::Cfg::BasicBlock> {
   class SourceVariable extends LocalVariableOrThis {
     SourceVariable() { not this.isCaptured() }
   }
@@ -23,7 +19,7 @@ module SsaConfig implements InputSig<js::DbLocation> {
     result.getContainer() = container
   }
 
-  predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableWrite(js::Cfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     certain = true and
     (
       bb.defAt(i, v.asLocalVariable(), _)
@@ -34,20 +30,15 @@ module SsaConfig implements InputSig<js::DbLocation> {
     )
   }
 
-  predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+  predicate variableRead(js::Cfg::BasicBlock bb, int i, SourceVariable v, boolean certain) {
     bb.useAt(i, v.asLocalVariable(), _) and certain = true
     or
     certain = true and
     bb.getNode(i).(ThisUse).getBindingContainer() = v.asThisContainer()
   }
-
-  predicate getImmediateBasicBlockDominator = BasicBlockInternal::immediateDominator/1;
-
-  pragma[inline]
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
 }
 
-import Make<js::DbLocation, SsaConfig>
+import Make<js::Location, js::Cfg, SsaConfig>
 
 module SsaDataflowInput implements DataFlowIntegrationInputSig {
   private import codeql.util.Boolean
@@ -55,7 +46,7 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
   class Expr extends js::ControlFlowNode {
     Expr() { this = any(SsaConfig::SourceVariable v).getAUse() }
 
-    predicate hasCfgNode(js::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(js::Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   predicate ssaDefHasSource(WriteDefinition def) {
@@ -82,7 +73,7 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(js::BasicBlock bb1, js::BasicBlock bb2, GuardValue branch) {
+    predicate hasValueBranchEdge(js::Cfg::BasicBlock bb1, js::Cfg::BasicBlock bb2, GuardValue branch) {
       exists(js::ConditionGuardNode g |
         g.getTest() = this and
         bb1 = this.getBasicBlock() and
@@ -96,13 +87,15 @@ module SsaDataflowInput implements DataFlowIntegrationInputSig {
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(js::BasicBlock bb1, js::BasicBlock bb2, GuardValue branch) {
+    predicate valueControlsBranchEdge(
+      js::Cfg::BasicBlock bb1, js::Cfg::BasicBlock bb2, GuardValue branch
+    ) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   pragma[inline]
-  predicate guardDirectlyControlsBlock(Guard guard, js::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, js::Cfg::BasicBlock bb, GuardValue branch) {
     exists(js::ConditionGuardNode g |
       g.getTest() = guard and
       g.dominates(bb) and
diff --git a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
index a451182aa21a..c0a783c17644 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/XmlParsers.qll
@@ -49,9 +49,7 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // internal entities are always resolved
-      kind = InternalEntity()
-      or
+      not kind = InternalEntity() and
       // other entities are only resolved if the configuration option `noent` is set to `true`
       exists(JS::Expr noent |
         this.hasOptionArgument(1, "noent", noent) and
@@ -126,8 +124,9 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // entities are resolved by default
-      any()
+      // SAX parsers in libxmljs also inherit libxml2's protection against XML bombs
+      kind = ExternalEntity(_) or
+      kind = ParameterEntity(true)
     }
 
     override DataFlow::Node getAResult() {
@@ -149,8 +148,9 @@ module XML {
     override JS::Expr getSourceArgument() { result = this.getArgument(0) }
 
     override predicate resolvesEntities(EntityKind kind) {
-      // entities are resolved by default
-      any()
+      // SAX push parsers in libxmljs also inherit libxml2's protection against XML bombs
+      kind = ExternalEntity(_) or
+      kind = ParameterEntity(true)
     }
 
     override DataFlow::Node getAResult() {
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 5e9846e9ad55..c61ecc138ef6 100644
--- a/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
+++ b/javascript/ql/lib/semmle/javascript/frameworks/data/internal/ApiGraphModelsSpecific.qll
@@ -58,9 +58,11 @@ predicate parseTypeString(string rawType, string package, string qualifiedName)
 predicate isPackageUsed(string package) {
   package = "global"
   or
-  package = any(JS::Import imp).getImportedPathString()
+  // To simplify which dependencies are needed to construct DataFlow::Node, we don't want to rely on `Import` here.
+  // Just check all string literals.
+  package = any(JS::Expr imp).getStringValue()
   or
-  any(JS::TypeAnnotation t).hasUnderlyingType(package, _)
+  package = any(JS::StringLiteralTypeExpr t).getValue() // Can be used in `import("foo")`
   or
   exists(JS::PackageJson json | json.getPackageName() = package)
 }
diff --git a/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll b/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
index c7ad2a1ada81..6742429b15e4 100644
--- a/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
+++ b/javascript/ql/lib/semmle/javascript/internal/BasicBlockInternal.qll
@@ -6,6 +6,7 @@
 import javascript
 private import semmle.javascript.internal.StmtContainers
 private import semmle.javascript.internal.CachedStages
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * Holds if `nd` starts a new basic block.
@@ -67,11 +68,12 @@ private module Cached {
   }
 
   cached
-  predicate defAt(BasicBlock bb, int i, Variable v, VarDef d) {
-    exists(VarRef lhs |
+  predicate defAt(BasicBlock bb, int i, Variable v, VarDef d, VarRef lhs) {
+    (
       lhs = d.getTarget().(BindingPattern).getABindingVarRef() and
       v = lhs.getVariable()
-    |
+    ) and
+    (
       lhs = d.getTarget() and
       bbIndex(bb, d, i)
       or
@@ -148,7 +150,10 @@ module Public {
     predicate useAt(int i, Variable v, VarUse u) { useAt(this, i, v, u) }
 
     /** Holds if this basic block defines variable `v` in its `i`th node `d`. */
-    predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d) }
+    predicate defAt(int i, Variable v, VarDef d) { defAt(this, i, v, d, _) }
+
+    /** Holds if this basic block defines variable `v` in its `i`th node `d`, and `lhs` is the corresponding variable reference. */
+    predicate defAt(int i, Variable v, VarDef d, VarRef lhs) { defAt(this, i, v, d, lhs) }
 
     /**
      * Holds if `v` is live at entry to this basic block and `u` is a use of `v`
@@ -362,4 +367,50 @@ module Public {
       )
     }
   }
+
+  final private class FinalBasicBlock = BasicBlock;
+
+  module Cfg implements BB::CfgSig<Location> {
+    private import javascript as Js
+    private import codeql.util.Unit
+
+    class ControlFlowNode = Js::ControlFlowNode;
+
+    class SuccessorType = Unit;
+
+    class BasicBlock extends FinalBasicBlock {
+      BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+      BasicBlock getASuccessor(SuccessorType t) { result = super.getASuccessor() and exists(t) }
+
+      predicate strictlyDominates(BasicBlock bb) {
+        this.(ReachableBasicBlock).strictlyDominates(bb)
+      }
+
+      predicate dominates(BasicBlock bb) { this.(ReachableBasicBlock).dominates(bb) }
+
+      predicate inDominanceFrontier(BasicBlock df) {
+        df.(ReachableJoinBlock).inDominanceFrontierOf(this)
+      }
+
+      BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+      predicate strictlyPostDominates(BasicBlock bb) {
+        this.(ReachableBasicBlock).strictlyPostDominates(bb)
+      }
+
+      predicate postDominates(BasicBlock bb) { this.(ReachableBasicBlock).postDominates(bb) }
+    }
+
+    class EntryBasicBlock extends BasicBlock {
+      EntryBasicBlock() { entryBB(this) }
+    }
+
+    pragma[nomagic]
+    predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+      bb1.getASuccessor() = bb2 and
+      bb1 = bb2.getImmediateDominator() and
+      forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+    }
+  }
 }
diff --git a/javascript/ql/lib/semmle/javascript/internal/Locations.qll b/javascript/ql/lib/semmle/javascript/internal/Locations.qll
deleted file mode 100644
index d1dc8d403f75..000000000000
--- a/javascript/ql/lib/semmle/javascript/internal/Locations.qll
+++ /dev/null
@@ -1,171 +0,0 @@
-/** Provides classes for working with locations and program elements that have locations. */
-
-import javascript
-
-// Should _not_ be cached, as that would require the data flow stage to be evaluated
-// in order to evaluate the AST stage. Ideally, we would cache each injector separately,
-// but that's not possible. Instead, we cache all predicates that need the injectors
-// to be tuple numbered.
-newtype TLocation =
-  TDbLocation(@location loc) or
-  TSynthLocation(string filepath, int startline, int startcolumn, int endline, int endcolumn) {
-    any(SsaDefinition def).hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn) and
-    // avoid overlap with existing DB locations
-    not exists(File f |
-      locations_default(_, f, startline, startcolumn, endline, endcolumn) and
-      f.getAbsolutePath() = filepath
-    )
-  }
-
-/**
- * A location as given by a file, a start line, a start column,
- * an end line, and an end column.
- *
- * For more information about locations see [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
- */
-abstract class LocationImpl extends TLocation {
-  /** Gets the file for this location. */
-  abstract File getFile();
-
-  /** Gets the 1-based line number (inclusive) where this location starts. */
-  abstract int getStartLine();
-
-  /** Gets the 1-based column number (inclusive) where this location starts. */
-  abstract int getStartColumn();
-
-  /** Gets the 1-based line number (inclusive) where this location ends. */
-  abstract int getEndLine();
-
-  /** Gets the 1-based column number (inclusive) where this location ends. */
-  abstract int getEndColumn();
-
-  /** Gets the number of lines covered by this location. */
-  int getNumLines() { result = this.getEndLine() - this.getStartLine() + 1 }
-
-  /** Holds if this location starts before location `that`. */
-  pragma[inline]
-  predicate startsBefore(Location that) {
-    exists(string f, int sl1, int sc1, int sl2, int sc2 |
-      this.hasLocationInfo(f, sl1, sc1, _, _) and
-      that.hasLocationInfo(f, sl2, sc2, _, _)
-    |
-      sl1 < sl2
-      or
-      sl1 = sl2 and sc1 < sc2
-    )
-  }
-
-  /** Holds if this location ends after location `that`. */
-  pragma[inline]
-  predicate endsAfter(Location that) {
-    exists(string f, int el1, int ec1, int el2, int ec2 |
-      this.hasLocationInfo(f, _, _, el1, ec1) and
-      that.hasLocationInfo(f, _, _, el2, ec2)
-    |
-      el1 > el2
-      or
-      el1 = el2 and ec1 > ec2
-    )
-  }
-
-  /**
-   * Holds if this location contains location `that`, meaning that it starts
-   * before and ends after it.
-   */
-  predicate contains(Location that) { this.startsBefore(that) and this.endsAfter(that) }
-
-  /** Holds if this location is empty. */
-  predicate isEmpty() { exists(int l, int c | this.hasLocationInfo(_, l, c, l, c - 1)) }
-
-  /** Gets a textual representation of this element. */
-  string toString() { result = this.getFile().getBaseName() + ":" + this.getStartLine().toString() }
-
-  /**
-   * Holds if this element is at the specified location.
-   * The location spans column `startcolumn` of line `startline` to
-   * column `endcolumn` of line `endline` in file `filepath`.
-   * For more information, see
-   * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
-   */
-  abstract predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  );
-}
-
-class DbLocationImpl extends LocationImpl instanceof DbLocation {
-  override File getFile() { result = DbLocation.super.getFile() }
-
-  override int getStartLine() { result = DbLocation.super.getStartLine() }
-
-  override int getStartColumn() { result = DbLocation.super.getStartColumn() }
-
-  override int getEndLine() { result = DbLocation.super.getEndLine() }
-
-  override int getEndColumn() { result = DbLocation.super.getEndColumn() }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    DbLocation.super.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-class SynthLocationImpl extends LocationImpl, TSynthLocation {
-  override File getFile() { synthLocationInfo(this, result.getAbsolutePath(), _, _, _, _) }
-
-  override int getStartLine() { synthLocationInfo(this, _, result, _, _, _) }
-
-  override int getStartColumn() { synthLocationInfo(this, _, _, result, _, _) }
-
-  override int getEndLine() { synthLocationInfo(this, _, _, _, result, _) }
-
-  override int getEndColumn() { synthLocationInfo(this, _, _, _, _, result) }
-
-  override predicate hasLocationInfo(
-    string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    synthLocationInfo(this, filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-cached
-private module Cached {
-  cached
-  DbLocation getLocatableLocation(@locatable l) {
-    exists(@location loc |
-      hasLocation(l, loc) or
-      xmllocations(l, loc) or
-      json_locations(l, loc) or
-      yaml_locations(l, loc)
-    |
-      result = TDbLocation(loc)
-    )
-  }
-
-  cached
-  predicate dbLocationInfo(
-    DbLocation l, File f, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    exists(@location loc |
-      l = TDbLocation(loc) and
-      locations_default(loc, f, startline, startcolumn, endline, endcolumn)
-    )
-  }
-}
-
-import Cached
-
-cached
-private module CachedInDataFlowStage {
-  private import semmle.javascript.internal.CachedStages
-
-  cached
-  predicate synthLocationInfo(
-    SynthLocationImpl l, string filepath, int startline, int startcolumn, int endline, int endcolumn
-  ) {
-    Stages::DataFlowStage::ref() and
-    l = TSynthLocation(filepath, startline, startcolumn, endline, endcolumn)
-  }
-}
-
-private import CachedInDataFlowStage
diff --git a/javascript/ql/lib/semmle/javascript/internal/Overlay.qll b/javascript/ql/lib/semmle/javascript/internal/Overlay.qll
new file mode 100644
index 000000000000..a20ac1868e6b
--- /dev/null
+++ b/javascript/ql/lib/semmle/javascript/internal/Overlay.qll
@@ -0,0 +1,30 @@
+private import javascript
+
+/** Holds if the database is an overlay. */
+overlay[local]
+private predicate isOverlay() { databaseMetadata("isOverlay", "true") }
+
+overlay[local]
+private string getFileFromEntity(@locatable node) {
+  exists(@location loc, @file file |
+    hasLocation(node, loc) and
+    locations_default(loc, file, _, _, _, _) and
+    files(file, result)
+  )
+}
+
+/** Holds if `file` was changed or deleted in the overlay. */
+overlay[local]
+private predicate discardFile(string file) { isOverlay() and overlayChangedFiles(file) }
+
+/** Holds if `node` is in the `file` and is part of the overlay base database. */
+overlay[local]
+private predicate discardableEntity(string file, @locatable node) {
+  not isOverlay() and file = getFileFromEntity(node)
+}
+
+/** Holds if `node` should be discarded, because it is part of the overlay base and is in a file that was also extracted as part of the overlay database. */
+overlay[discard_entity]
+private predicate discardEntity(@locatable node) {
+  exists(string file | discardableEntity(file, node) and discardFile(file))
+}
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme b/javascript/ql/lib/semmlecode.javascript.dbscheme
index ccefb5e2d493..76a926a00d5f 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme
@@ -1192,3 +1192,13 @@ configLocations(
 );
 
 @configLocatable = @config | @configName | @configValue;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
index 51889bd9286f..eee67ae3e4ff 100644
--- a/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
+++ b/javascript/ql/lib/semmlecode.javascript.dbscheme.stats
@@ -28260,5 +28260,52 @@
 </dep>
 </dependencies>
 </relation>
+<relation>
+<name>databaseMetadata</name>
+<cardinality>1</cardinality>
+<columnsizes>
+<e>
+<k>metadataKey</k>
+<v>1</v>
+</e>
+<e>
+<k>value</k>
+<v>1</v>
+</e>
+</columnsizes>
+<dependencies>
+<dep>
+<src>metadataKey</src>
+<trg>value</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+<dep>
+<src>value</src>
+<trg>metadataKey</trg>
+<val>
+<hist>
+<budget>12</budget>
+<bs/>
+</hist>
+</val>
+</dep>
+</dependencies>
+</relation>
+<relation>
+<name>overlayChangedFiles</name>
+<cardinality>50</cardinality>
+<columnsizes>
+<e>
+<k>path</k>
+<v>50</v>
+</e>
+</columnsizes>
+<dependencies/>
+</relation>
 </stats>
 </dbstats>
diff --git a/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/old.dbscheme
new file mode 100644
index 000000000000..ccefb5e2d493
--- /dev/null
+++ b/javascript/ql/lib/upgrades/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/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
new file mode 100644
index 000000000000..76a926a00d5f
--- /dev/null
+++ b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/semmlecode.javascript.dbscheme
@@ -0,0 +1,1204 @@
+/*** 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
diff --git a/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
new file mode 100644
index 000000000000..4ff972031d7d
--- /dev/null
+++ b/javascript/ql/lib/upgrades/ccefb5e2d49318eea4aeafd4c6ae2af9f94ac72a/upgrade.properties
@@ -0,0 +1,2 @@
+description: add overlay relations
+compatibility: full
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index ce2c8bacbb32..ab471438cb11 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.3
+
+No user-facing changes.
+
 ## 2.0.2
 
 ### Minor Analysis Improvements
diff --git a/javascript/ql/src/change-notes/released/2.0.3.md b/javascript/ql/src/change-notes/released/2.0.3.md
new file mode 100644
index 000000000000..7bd669821d5f
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.0.3.md
@@ -0,0 +1,3 @@
+## 2.0.3
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 81c7f1dbc13c..fabf1e865966 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.2
+lastReleaseVersion: 2.0.3
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 1f71ec359c42..3e8546ddfb9d 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.0.2
+version: 2.0.3
 groups:
   - javascript
   - queries
diff --git a/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected b/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
index 4cd0cf233782..1d53bbb1b25c 100644
--- a/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
+++ b/javascript/ql/test/experimental/FormParsers/RemoteFlowSource.expected
@@ -1,17 +1,17 @@
 edges
 | busybus.js:9:30:9:33 | file | busybus.js:13:23:13:23 | z | provenance |  |
 | busybus.js:9:36:9:39 | info | busybus.js:10:54:10:57 | info | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | encoding | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | filename | provenance |  |
-| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:19:10:57 | mimeType | provenance |  |
-| busybus.js:10:19:10:57 | encoding | busybus.js:12:28:12:35 | encoding | provenance |  |
-| busybus.js:10:19:10:57 | filename | busybus.js:12:18:12:25 | filename | provenance |  |
-| busybus.js:10:19:10:57 | mimeType | busybus.js:12:38:12:45 | mimeType | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:21:10:28 | filename | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:31:10:38 | encoding | provenance |  |
+| busybus.js:10:19:10:50 | { filen ... eType } | busybus.js:10:41:10:48 | mimeType | provenance |  |
+| busybus.js:10:21:10:28 | filename | busybus.js:12:18:12:25 | filename | provenance |  |
+| busybus.js:10:31:10:38 | encoding | busybus.js:12:28:12:35 | encoding | provenance |  |
+| busybus.js:10:41:10:48 | mimeType | busybus.js:12:38:12:45 | mimeType | provenance |  |
 | busybus.js:10:54:10:57 | info | busybus.js:10:19:10:50 | { filen ... eType } | provenance |  |
 | busybus.js:13:23:13:23 | z | busybus.js:13:31:13:36 | sink() | provenance |  |
 | busybus.js:15:30:15:33 | data | busybus.js:16:22:16:25 | data | provenance |  |
-| busybus.js:22:25:22:42 | data | busybus.js:23:26:23:29 | data | provenance |  |
-| busybus.js:22:32:22:42 | this.read() | busybus.js:22:25:22:42 | data | provenance |  |
+| busybus.js:22:25:22:28 | data | busybus.js:23:26:23:29 | data | provenance |  |
+| busybus.js:22:32:22:42 | this.read() | busybus.js:22:25:22:28 | data | provenance |  |
 | busybus.js:27:25:27:28 | name | busybus.js:28:18:28:21 | name | provenance |  |
 | busybus.js:27:31:27:33 | val | busybus.js:28:24:28:26 | val | provenance |  |
 | busybus.js:27:36:27:39 | info | busybus.js:28:29:28:32 | info | provenance |  |
@@ -19,10 +19,10 @@ edges
 | dicer.js:14:28:14:33 | header | dicer.js:16:22:16:27 | header | provenance |  |
 | dicer.js:16:22:16:27 | header | dicer.js:16:22:16:30 | header[h] | provenance |  |
 | dicer.js:19:26:19:29 | data | dicer.js:20:18:20:21 | data | provenance |  |
-| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:11:7:49 | fields | provenance |  |
-| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:11:7:49 | files | provenance |  |
-| formidable.js:7:11:7:49 | fields | formidable.js:8:10:8:15 | fields | provenance |  |
-| formidable.js:7:11:7:49 | files | formidable.js:8:18:8:22 | files | provenance |  |
+| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:12:7:17 | fields | provenance |  |
+| formidable.js:7:11:7:25 | [fields, files] | formidable.js:7:20:7:24 | files | provenance |  |
+| formidable.js:7:12:7:17 | fields | formidable.js:8:10:8:15 | fields | provenance |  |
+| formidable.js:7:20:7:24 | files | formidable.js:8:18:8:22 | files | provenance |  |
 | formidable.js:7:29:7:49 | await f ... se(req) | formidable.js:7:11:7:25 | [fields, files] | provenance |  |
 | formidable.js:7:35:7:49 | form.parse(req) | formidable.js:7:29:7:49 | await f ... se(req) | provenance |  |
 | formidable.js:9:27:9:34 | formname | formidable.js:10:14:10:21 | formname | provenance |  |
@@ -39,9 +39,9 @@ nodes
 | busybus.js:9:30:9:33 | file | semmle.label | file |
 | busybus.js:9:36:9:39 | info | semmle.label | info |
 | busybus.js:10:19:10:50 | { filen ... eType } | semmle.label | { filen ... eType } |
-| busybus.js:10:19:10:57 | encoding | semmle.label | encoding |
-| busybus.js:10:19:10:57 | filename | semmle.label | filename |
-| busybus.js:10:19:10:57 | mimeType | semmle.label | mimeType |
+| busybus.js:10:21:10:28 | filename | semmle.label | filename |
+| busybus.js:10:31:10:38 | encoding | semmle.label | encoding |
+| busybus.js:10:41:10:48 | mimeType | semmle.label | mimeType |
 | busybus.js:10:54:10:57 | info | semmle.label | info |
 | busybus.js:12:18:12:25 | filename | semmle.label | filename |
 | busybus.js:12:28:12:35 | encoding | semmle.label | encoding |
@@ -50,7 +50,7 @@ nodes
 | busybus.js:13:31:13:36 | sink() | semmle.label | sink() |
 | busybus.js:15:30:15:33 | data | semmle.label | data |
 | busybus.js:16:22:16:25 | data | semmle.label | data |
-| busybus.js:22:25:22:42 | data | semmle.label | data |
+| busybus.js:22:25:22:28 | data | semmle.label | data |
 | busybus.js:22:32:22:42 | this.read() | semmle.label | this.read() |
 | busybus.js:23:26:23:29 | data | semmle.label | data |
 | busybus.js:27:25:27:28 | name | semmle.label | name |
@@ -67,8 +67,8 @@ nodes
 | dicer.js:19:26:19:29 | data | semmle.label | data |
 | dicer.js:20:18:20:21 | data | semmle.label | data |
 | formidable.js:7:11:7:25 | [fields, files] | semmle.label | [fields, files] |
-| formidable.js:7:11:7:49 | fields | semmle.label | fields |
-| formidable.js:7:11:7:49 | files | semmle.label | files |
+| formidable.js:7:12:7:17 | fields | semmle.label | fields |
+| formidable.js:7:20:7:24 | files | semmle.label | files |
 | formidable.js:7:29:7:49 | await f ... se(req) | semmle.label | await f ... se(req) |
 | formidable.js:7:35:7:49 | form.parse(req) | semmle.label | form.parse(req) |
 | formidable.js:8:10:8:15 | fields | semmle.label | fields |
diff --git a/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected b/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
index ab162e0b3114..0385389e73c1 100644
--- a/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-094-dataURL/CodeInjection.expected
@@ -1,33 +1,33 @@
 edges
-| test.js:5:11:5:44 | payload | test.js:6:30:6:36 | payload | provenance |  |
-| test.js:5:11:5:44 | payload | test.js:9:26:9:32 | payload | provenance |  |
-| test.js:5:21:5:44 | req.que ... rameter | test.js:5:11:5:44 | payload | provenance |  |
-| test.js:6:9:6:43 | payloadURL | test.js:7:16:7:25 | payloadURL | provenance |  |
-| test.js:6:22:6:43 | new URL ...  + sth) | test.js:6:9:6:43 | payloadURL | provenance |  |
+| test.js:5:11:5:17 | payload | test.js:6:30:6:36 | payload | provenance |  |
+| test.js:5:11:5:17 | payload | test.js:9:26:9:32 | payload | provenance |  |
+| test.js:5:21:5:44 | req.que ... rameter | test.js:5:11:5:17 | payload | provenance |  |
+| test.js:6:9:6:18 | payloadURL | test.js:7:16:7:25 | payloadURL | provenance |  |
+| test.js:6:22:6:43 | new URL ...  + sth) | test.js:6:9:6:18 | payloadURL | provenance |  |
 | test.js:6:30:6:36 | payload | test.js:6:30:6:42 | payload + sth | provenance |  |
 | test.js:6:30:6:42 | payload + sth | test.js:6:22:6:43 | new URL ...  + sth) | provenance | Config |
-| test.js:9:5:9:39 | payloadURL | test.js:10:16:10:25 | payloadURL | provenance |  |
-| test.js:9:18:9:39 | new URL ...  + sth) | test.js:9:5:9:39 | payloadURL | provenance |  |
+| test.js:9:5:9:14 | payloadURL | test.js:10:16:10:25 | payloadURL | provenance |  |
+| test.js:9:18:9:39 | new URL ...  + sth) | test.js:9:5:9:14 | payloadURL | provenance |  |
 | test.js:9:26:9:32 | payload | test.js:9:26:9:38 | payload + sth | provenance |  |
 | test.js:9:26:9:38 | payload + sth | test.js:9:18:9:39 | new URL ...  + sth) | provenance | Config |
-| test.js:17:11:17:44 | payload | test.js:18:18:18:24 | payload | provenance |  |
-| test.js:17:11:17:44 | payload | test.js:19:18:19:24 | payload | provenance |  |
-| test.js:17:21:17:44 | req.que ... rameter | test.js:17:11:17:44 | payload | provenance |  |
+| test.js:17:11:17:17 | payload | test.js:18:18:18:24 | payload | provenance |  |
+| test.js:17:11:17:17 | payload | test.js:19:18:19:24 | payload | provenance |  |
+| test.js:17:21:17:44 | req.que ... rameter | test.js:17:11:17:17 | payload | provenance |  |
 | test.js:19:18:19:24 | payload | test.js:19:18:19:30 | payload + sth | provenance |  |
 nodes
-| test.js:5:11:5:44 | payload | semmle.label | payload |
+| test.js:5:11:5:17 | payload | semmle.label | payload |
 | test.js:5:21:5:44 | req.que ... rameter | semmle.label | req.que ... rameter |
-| test.js:6:9:6:43 | payloadURL | semmle.label | payloadURL |
+| test.js:6:9:6:18 | payloadURL | semmle.label | payloadURL |
 | test.js:6:22:6:43 | new URL ...  + sth) | semmle.label | new URL ...  + sth) |
 | test.js:6:30:6:36 | payload | semmle.label | payload |
 | test.js:6:30:6:42 | payload + sth | semmle.label | payload + sth |
 | test.js:7:16:7:25 | payloadURL | semmle.label | payloadURL |
-| test.js:9:5:9:39 | payloadURL | semmle.label | payloadURL |
+| test.js:9:5:9:14 | payloadURL | semmle.label | payloadURL |
 | test.js:9:18:9:39 | new URL ...  + sth) | semmle.label | new URL ...  + sth) |
 | test.js:9:26:9:32 | payload | semmle.label | payload |
 | test.js:9:26:9:38 | payload + sth | semmle.label | payload + sth |
 | test.js:10:16:10:25 | payloadURL | semmle.label | payloadURL |
-| test.js:17:11:17:44 | payload | semmle.label | payload |
+| test.js:17:11:17:17 | payload | semmle.label | payload |
 | test.js:17:21:17:44 | req.que ... rameter | semmle.label | req.que ... rameter |
 | test.js:18:18:18:24 | payload | semmle.label | payload |
 | test.js:19:18:19:24 | payload | semmle.label | payload |
diff --git a/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected b/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
index 40313cf964c9..d54685c97bef 100644
--- a/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-099/EnvValueAndKeyInjection/EnvValueAndKeyInjection.expected
@@ -1,28 +1,28 @@
 edges
-| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:9:5:39 | EnvKey | provenance |  |
-| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:9:5:39 | EnvValue | provenance |  |
-| test.js:5:9:5:39 | EnvKey | test.js:6:15:6:20 | EnvKey | provenance |  |
-| test.js:5:9:5:39 | EnvKey | test.js:7:15:7:20 | EnvKey | provenance |  |
-| test.js:5:9:5:39 | EnvValue | test.js:6:25:6:32 | EnvValue | provenance |  |
-| test.js:5:9:5:39 | EnvValue | test.js:7:25:7:32 | EnvValue | provenance |  |
+| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:11:5:18 | EnvValue | provenance |  |
+| test.js:5:9:5:28 | { EnvValue, EnvKey } | test.js:5:21:5:26 | EnvKey | provenance |  |
+| test.js:5:11:5:18 | EnvValue | test.js:6:25:6:32 | EnvValue | provenance |  |
+| test.js:5:11:5:18 | EnvValue | test.js:7:25:7:32 | EnvValue | provenance |  |
+| test.js:5:21:5:26 | EnvKey | test.js:6:15:6:20 | EnvKey | provenance |  |
+| test.js:5:21:5:26 | EnvKey | test.js:7:15:7:20 | EnvKey | provenance |  |
 | test.js:5:32:5:39 | req.body | test.js:5:9:5:28 | { EnvValue, EnvKey } | provenance |  |
-| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:9:13:39 | EnvKey | provenance |  |
-| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:9:13:39 | EnvValue | provenance |  |
-| test.js:13:9:13:39 | EnvKey | test.js:15:15:15:20 | EnvKey | provenance |  |
-| test.js:13:9:13:39 | EnvValue | test.js:16:26:16:33 | EnvValue | provenance |  |
+| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:11:13:18 | EnvValue | provenance |  |
+| test.js:13:9:13:28 | { EnvValue, EnvKey } | test.js:13:21:13:26 | EnvKey | provenance |  |
+| test.js:13:11:13:18 | EnvValue | test.js:16:26:16:33 | EnvValue | provenance |  |
+| test.js:13:21:13:26 | EnvKey | test.js:15:15:15:20 | EnvKey | provenance |  |
 | test.js:13:32:13:39 | req.body | test.js:13:9:13:28 | { EnvValue, EnvKey } | provenance |  |
 nodes
 | test.js:5:9:5:28 | { EnvValue, EnvKey } | semmle.label | { EnvValue, EnvKey } |
-| test.js:5:9:5:39 | EnvKey | semmle.label | EnvKey |
-| test.js:5:9:5:39 | EnvValue | semmle.label | EnvValue |
+| test.js:5:11:5:18 | EnvValue | semmle.label | EnvValue |
+| test.js:5:21:5:26 | EnvKey | semmle.label | EnvKey |
 | test.js:5:32:5:39 | req.body | semmle.label | req.body |
 | test.js:6:15:6:20 | EnvKey | semmle.label | EnvKey |
 | test.js:6:25:6:32 | EnvValue | semmle.label | EnvValue |
 | test.js:7:15:7:20 | EnvKey | semmle.label | EnvKey |
 | test.js:7:25:7:32 | EnvValue | semmle.label | EnvValue |
 | test.js:13:9:13:28 | { EnvValue, EnvKey } | semmle.label | { EnvValue, EnvKey } |
-| test.js:13:9:13:39 | EnvKey | semmle.label | EnvKey |
-| test.js:13:9:13:39 | EnvValue | semmle.label | EnvValue |
+| test.js:13:11:13:18 | EnvValue | semmle.label | EnvValue |
+| test.js:13:21:13:26 | EnvKey | semmle.label | EnvKey |
 | test.js:13:32:13:39 | req.body | semmle.label | req.body |
 | test.js:15:15:15:20 | EnvKey | semmle.label | EnvKey |
 | test.js:16:26:16:33 | EnvValue | semmle.label | EnvValue |
diff --git a/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected b/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
index 87f6e5d4b86b..5ba1884017f6 100644
--- a/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
+++ b/javascript/ql/test/experimental/Security/CWE-099/EnvValueInjection/EnvValueInjection.expected
@@ -1,12 +1,12 @@
 edges
-| test.js:4:9:4:20 | { EnvValue } | test.js:4:9:4:31 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:5:35:5:42 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:6:23:6:30 | EnvValue | provenance |  |
-| test.js:4:9:4:31 | EnvValue | test.js:7:22:7:29 | EnvValue | provenance |  |
+| test.js:4:9:4:20 | { EnvValue } | test.js:4:11:4:18 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:5:35:5:42 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:6:23:6:30 | EnvValue | provenance |  |
+| test.js:4:11:4:18 | EnvValue | test.js:7:22:7:29 | EnvValue | provenance |  |
 | test.js:4:24:4:31 | req.body | test.js:4:9:4:20 | { EnvValue } | provenance |  |
 nodes
 | test.js:4:9:4:20 | { EnvValue } | semmle.label | { EnvValue } |
-| test.js:4:9:4:31 | EnvValue | semmle.label | EnvValue |
+| test.js:4:11:4:18 | EnvValue | semmle.label | EnvValue |
 | test.js:4:24:4:31 | req.body | semmle.label | req.body |
 | test.js:5:35:5:42 | EnvValue | semmle.label | EnvValue |
 | test.js:6:23:6:30 | EnvValue | semmle.label | EnvValue |
diff --git a/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected b/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
index 0f67cfc85132..09db119d0786 100644
--- a/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
+++ b/javascript/ql/test/experimental/Security/CWE-347/localsource/decodeJwtWithoutVerificationLocalSource.expected
@@ -1,74 +1,74 @@
 edges
-| JsonWebToken.js:13:11:13:28 | UserToken | JsonWebToken.js:16:28:16:36 | UserToken | provenance |  |
-| JsonWebToken.js:13:23:13:28 | aJwt() | JsonWebToken.js:13:11:13:28 | UserToken | provenance |  |
-| JsonWebToken.js:20:11:20:28 | UserToken | JsonWebToken.js:23:28:23:36 | UserToken | provenance |  |
-| JsonWebToken.js:20:11:20:28 | UserToken | JsonWebToken.js:24:28:24:36 | UserToken | provenance |  |
-| JsonWebToken.js:20:23:20:28 | aJwt() | JsonWebToken.js:20:11:20:28 | UserToken | provenance |  |
-| JsonWebToken.js:28:11:28:28 | UserToken | JsonWebToken.js:31:28:31:36 | UserToken | provenance |  |
-| JsonWebToken.js:28:23:28:28 | aJwt() | JsonWebToken.js:28:11:28:28 | UserToken | provenance |  |
-| JsonWebToken.js:35:11:35:28 | UserToken | JsonWebToken.js:38:28:38:36 | UserToken | provenance |  |
-| JsonWebToken.js:35:11:35:28 | UserToken | JsonWebToken.js:39:28:39:36 | UserToken | provenance |  |
-| JsonWebToken.js:35:23:35:28 | aJwt() | JsonWebToken.js:35:11:35:28 | UserToken | provenance |  |
-| JsonWebToken.js:43:11:43:28 | UserToken | JsonWebToken.js:46:28:46:36 | UserToken | provenance |  |
-| JsonWebToken.js:43:11:43:28 | UserToken | JsonWebToken.js:47:28:47:36 | UserToken | provenance |  |
-| JsonWebToken.js:43:23:43:28 | aJwt() | JsonWebToken.js:43:11:43:28 | UserToken | provenance |  |
-| jose.js:12:11:12:28 | UserToken | jose.js:15:20:15:28 | UserToken | provenance |  |
-| jose.js:12:23:12:28 | aJwt() | jose.js:12:11:12:28 | UserToken | provenance |  |
-| jose.js:19:11:19:28 | UserToken | jose.js:22:20:22:28 | UserToken | provenance |  |
-| jose.js:19:11:19:28 | UserToken | jose.js:23:26:23:34 | UserToken | provenance |  |
-| jose.js:19:23:19:28 | aJwt() | jose.js:19:11:19:28 | UserToken | provenance |  |
-| jose.js:27:11:27:28 | UserToken | jose.js:30:26:30:34 | UserToken | provenance |  |
-| jose.js:27:23:27:28 | aJwt() | jose.js:27:11:27:28 | UserToken | provenance |  |
-| jwtDecode.js:13:11:13:28 | UserToken | jwtDecode.js:17:16:17:24 | UserToken | provenance |  |
-| jwtDecode.js:13:23:13:28 | aJwt() | jwtDecode.js:13:11:13:28 | UserToken | provenance |  |
-| jwtSimple.js:13:11:13:28 | UserToken | jwtSimple.js:16:23:16:31 | UserToken | provenance |  |
-| jwtSimple.js:13:23:13:28 | aJwt() | jwtSimple.js:13:11:13:28 | UserToken | provenance |  |
-| jwtSimple.js:20:11:20:28 | UserToken | jwtSimple.js:23:23:23:31 | UserToken | provenance |  |
-| jwtSimple.js:20:11:20:28 | UserToken | jwtSimple.js:24:23:24:31 | UserToken | provenance |  |
-| jwtSimple.js:20:23:20:28 | aJwt() | jwtSimple.js:20:11:20:28 | UserToken | provenance |  |
-| jwtSimple.js:28:11:28:28 | UserToken | jwtSimple.js:31:23:31:31 | UserToken | provenance |  |
-| jwtSimple.js:28:11:28:28 | UserToken | jwtSimple.js:32:23:32:31 | UserToken | provenance |  |
-| jwtSimple.js:28:23:28:28 | aJwt() | jwtSimple.js:28:11:28:28 | UserToken | provenance |  |
+| JsonWebToken.js:13:11:13:19 | UserToken | JsonWebToken.js:16:28:16:36 | UserToken | provenance |  |
+| JsonWebToken.js:13:23:13:28 | aJwt() | JsonWebToken.js:13:11:13:19 | UserToken | provenance |  |
+| JsonWebToken.js:20:11:20:19 | UserToken | JsonWebToken.js:23:28:23:36 | UserToken | provenance |  |
+| JsonWebToken.js:20:11:20:19 | UserToken | JsonWebToken.js:24:28:24:36 | UserToken | provenance |  |
+| JsonWebToken.js:20:23:20:28 | aJwt() | JsonWebToken.js:20:11:20:19 | UserToken | provenance |  |
+| JsonWebToken.js:28:11:28:19 | UserToken | JsonWebToken.js:31:28:31:36 | UserToken | provenance |  |
+| JsonWebToken.js:28:23:28:28 | aJwt() | JsonWebToken.js:28:11:28:19 | UserToken | provenance |  |
+| JsonWebToken.js:35:11:35:19 | UserToken | JsonWebToken.js:38:28:38:36 | UserToken | provenance |  |
+| JsonWebToken.js:35:11:35:19 | UserToken | JsonWebToken.js:39:28:39:36 | UserToken | provenance |  |
+| JsonWebToken.js:35:23:35:28 | aJwt() | JsonWebToken.js:35:11:35:19 | UserToken | provenance |  |
+| JsonWebToken.js:43:11:43:19 | UserToken | JsonWebToken.js:46:28:46:36 | UserToken | provenance |  |
+| JsonWebToken.js:43:11:43:19 | UserToken | JsonWebToken.js:47:28:47:36 | UserToken | provenance |  |
+| JsonWebToken.js:43:23:43:28 | aJwt() | JsonWebToken.js:43:11:43:19 | UserToken | provenance |  |
+| jose.js:12:11:12:19 | UserToken | jose.js:15:20:15:28 | UserToken | provenance |  |
+| jose.js:12:23:12:28 | aJwt() | jose.js:12:11:12:19 | UserToken | provenance |  |
+| jose.js:19:11:19:19 | UserToken | jose.js:22:20:22:28 | UserToken | provenance |  |
+| jose.js:19:11:19:19 | UserToken | jose.js:23:26:23:34 | UserToken | provenance |  |
+| jose.js:19:23:19:28 | aJwt() | jose.js:19:11:19:19 | UserToken | provenance |  |
+| jose.js:27:11:27:19 | UserToken | jose.js:30:26:30:34 | UserToken | provenance |  |
+| jose.js:27:23:27:28 | aJwt() | jose.js:27:11:27:19 | UserToken | provenance |  |
+| jwtDecode.js:13:11:13:19 | UserToken | jwtDecode.js:17:16:17:24 | UserToken | provenance |  |
+| jwtDecode.js:13:23:13:28 | aJwt() | jwtDecode.js:13:11:13:19 | UserToken | provenance |  |
+| jwtSimple.js:13:11:13:19 | UserToken | jwtSimple.js:16:23:16:31 | UserToken | provenance |  |
+| jwtSimple.js:13:23:13:28 | aJwt() | jwtSimple.js:13:11:13:19 | UserToken | provenance |  |
+| jwtSimple.js:20:11:20:19 | UserToken | jwtSimple.js:23:23:23:31 | UserToken | provenance |  |
+| jwtSimple.js:20:11:20:19 | UserToken | jwtSimple.js:24:23:24:31 | UserToken | provenance |  |
+| jwtSimple.js:20:23:20:28 | aJwt() | jwtSimple.js:20:11:20:19 | UserToken | provenance |  |
+| jwtSimple.js:28:11:28:19 | UserToken | jwtSimple.js:31:23:31:31 | UserToken | provenance |  |
+| jwtSimple.js:28:11:28:19 | UserToken | jwtSimple.js:32:23:32:31 | UserToken | provenance |  |
+| jwtSimple.js:28:23:28:28 | aJwt() | jwtSimple.js:28:11:28:19 | UserToken | provenance |  |
 nodes
-| JsonWebToken.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:16:28:16:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:20:11:20:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:20:11:20:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:20:23:20:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:23:28:23:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:24:28:24:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:28:11:28:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:28:11:28:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:28:23:28:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:31:28:31:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:35:11:35:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:35:11:35:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:35:23:35:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:38:28:38:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:39:28:39:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:43:11:43:28 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:43:11:43:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:43:23:43:28 | aJwt() | semmle.label | aJwt() |
 | JsonWebToken.js:46:28:46:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:47:28:47:36 | UserToken | semmle.label | UserToken |
-| jose.js:12:11:12:28 | UserToken | semmle.label | UserToken |
+| jose.js:12:11:12:19 | UserToken | semmle.label | UserToken |
 | jose.js:12:23:12:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:15:20:15:28 | UserToken | semmle.label | UserToken |
-| jose.js:19:11:19:28 | UserToken | semmle.label | UserToken |
+| jose.js:19:11:19:19 | UserToken | semmle.label | UserToken |
 | jose.js:19:23:19:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:22:20:22:28 | UserToken | semmle.label | UserToken |
 | jose.js:23:26:23:34 | UserToken | semmle.label | UserToken |
-| jose.js:27:11:27:28 | UserToken | semmle.label | UserToken |
+| jose.js:27:11:27:19 | UserToken | semmle.label | UserToken |
 | jose.js:27:23:27:28 | aJwt() | semmle.label | aJwt() |
 | jose.js:30:26:30:34 | UserToken | semmle.label | UserToken |
-| jwtDecode.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| jwtDecode.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | jwtDecode.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | jwtDecode.js:17:16:17:24 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:13:11:13:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:13:11:13:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:13:23:13:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:16:23:16:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:20:11:20:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:20:11:20:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:20:23:20:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:23:23:23:31 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:24:23:24:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:28:11:28:28 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:28:11:28:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:28:23:28:28 | aJwt() | semmle.label | aJwt() |
 | jwtSimple.js:31:23:31:31 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:32:23:32:31 | UserToken | semmle.label | UserToken |
diff --git a/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected b/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
index bb6ca940759f..364fbd76b002 100644
--- a/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
+++ b/javascript/ql/test/experimental/Security/CWE-347/remotesource/decodeJwtWithoutVerification.expected
@@ -1,50 +1,50 @@
 edges
-| JsonWebToken.js:10:11:10:47 | UserToken | JsonWebToken.js:13:28:13:36 | UserToken | provenance |  |
-| JsonWebToken.js:10:23:10:47 | req.hea ... ization | JsonWebToken.js:10:11:10:47 | UserToken | provenance |  |
-| JsonWebToken.js:17:11:17:47 | UserToken | JsonWebToken.js:20:28:20:36 | UserToken | provenance |  |
-| JsonWebToken.js:17:11:17:47 | UserToken | JsonWebToken.js:21:28:21:36 | UserToken | provenance |  |
-| JsonWebToken.js:17:23:17:47 | req.hea ... ization | JsonWebToken.js:17:11:17:47 | UserToken | provenance |  |
-| JsonWebToken.js:32:11:32:47 | UserToken | JsonWebToken.js:35:28:35:36 | UserToken | provenance |  |
-| JsonWebToken.js:32:23:32:47 | req.hea ... ization | JsonWebToken.js:32:11:32:47 | UserToken | provenance |  |
-| JsonWebToken.js:40:11:40:47 | UserToken | JsonWebToken.js:43:28:43:36 | UserToken | provenance |  |
-| JsonWebToken.js:40:23:40:47 | req.hea ... ization | JsonWebToken.js:40:11:40:47 | UserToken | provenance |  |
-| jose.js:11:11:11:47 | UserToken | jose.js:13:20:13:28 | UserToken | provenance |  |
-| jose.js:11:23:11:47 | req.hea ... ization | jose.js:11:11:11:47 | UserToken | provenance |  |
-| jose.js:24:11:24:47 | UserToken | jose.js:26:20:26:28 | UserToken | provenance |  |
-| jose.js:24:23:24:47 | req.hea ... ization | jose.js:24:11:24:47 | UserToken | provenance |  |
-| jwtDecode.js:11:11:11:47 | UserToken | jwtDecode.js:15:16:15:24 | UserToken | provenance |  |
-| jwtDecode.js:11:23:11:47 | req.hea ... ization | jwtDecode.js:11:11:11:47 | UserToken | provenance |  |
-| jwtSimple.js:10:11:10:47 | UserToken | jwtSimple.js:13:23:13:31 | UserToken | provenance |  |
-| jwtSimple.js:10:23:10:47 | req.hea ... ization | jwtSimple.js:10:11:10:47 | UserToken | provenance |  |
-| jwtSimple.js:25:11:25:47 | UserToken | jwtSimple.js:28:23:28:31 | UserToken | provenance |  |
-| jwtSimple.js:25:23:25:47 | req.hea ... ization | jwtSimple.js:25:11:25:47 | UserToken | provenance |  |
+| JsonWebToken.js:10:11:10:19 | UserToken | JsonWebToken.js:13:28:13:36 | UserToken | provenance |  |
+| JsonWebToken.js:10:23:10:47 | req.hea ... ization | JsonWebToken.js:10:11:10:19 | UserToken | provenance |  |
+| JsonWebToken.js:17:11:17:19 | UserToken | JsonWebToken.js:20:28:20:36 | UserToken | provenance |  |
+| JsonWebToken.js:17:11:17:19 | UserToken | JsonWebToken.js:21:28:21:36 | UserToken | provenance |  |
+| JsonWebToken.js:17:23:17:47 | req.hea ... ization | JsonWebToken.js:17:11:17:19 | UserToken | provenance |  |
+| JsonWebToken.js:32:11:32:19 | UserToken | JsonWebToken.js:35:28:35:36 | UserToken | provenance |  |
+| JsonWebToken.js:32:23:32:47 | req.hea ... ization | JsonWebToken.js:32:11:32:19 | UserToken | provenance |  |
+| JsonWebToken.js:40:11:40:19 | UserToken | JsonWebToken.js:43:28:43:36 | UserToken | provenance |  |
+| JsonWebToken.js:40:23:40:47 | req.hea ... ization | JsonWebToken.js:40:11:40:19 | UserToken | provenance |  |
+| jose.js:11:11:11:19 | UserToken | jose.js:13:20:13:28 | UserToken | provenance |  |
+| jose.js:11:23:11:47 | req.hea ... ization | jose.js:11:11:11:19 | UserToken | provenance |  |
+| jose.js:24:11:24:19 | UserToken | jose.js:26:20:26:28 | UserToken | provenance |  |
+| jose.js:24:23:24:47 | req.hea ... ization | jose.js:24:11:24:19 | UserToken | provenance |  |
+| jwtDecode.js:11:11:11:19 | UserToken | jwtDecode.js:15:16:15:24 | UserToken | provenance |  |
+| jwtDecode.js:11:23:11:47 | req.hea ... ization | jwtDecode.js:11:11:11:19 | UserToken | provenance |  |
+| jwtSimple.js:10:11:10:19 | UserToken | jwtSimple.js:13:23:13:31 | UserToken | provenance |  |
+| jwtSimple.js:10:23:10:47 | req.hea ... ization | jwtSimple.js:10:11:10:19 | UserToken | provenance |  |
+| jwtSimple.js:25:11:25:19 | UserToken | jwtSimple.js:28:23:28:31 | UserToken | provenance |  |
+| jwtSimple.js:25:23:25:47 | req.hea ... ization | jwtSimple.js:25:11:25:19 | UserToken | provenance |  |
 nodes
-| JsonWebToken.js:10:11:10:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:10:11:10:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:10:23:10:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:13:28:13:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:17:11:17:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:17:11:17:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:17:23:17:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:20:28:20:36 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:21:28:21:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:32:11:32:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:32:11:32:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:32:23:32:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:35:28:35:36 | UserToken | semmle.label | UserToken |
-| JsonWebToken.js:40:11:40:47 | UserToken | semmle.label | UserToken |
+| JsonWebToken.js:40:11:40:19 | UserToken | semmle.label | UserToken |
 | JsonWebToken.js:40:23:40:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | JsonWebToken.js:43:28:43:36 | UserToken | semmle.label | UserToken |
-| jose.js:11:11:11:47 | UserToken | semmle.label | UserToken |
+| jose.js:11:11:11:19 | UserToken | semmle.label | UserToken |
 | jose.js:11:23:11:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jose.js:13:20:13:28 | UserToken | semmle.label | UserToken |
-| jose.js:24:11:24:47 | UserToken | semmle.label | UserToken |
+| jose.js:24:11:24:19 | UserToken | semmle.label | UserToken |
 | jose.js:24:23:24:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jose.js:26:20:26:28 | UserToken | semmle.label | UserToken |
-| jwtDecode.js:11:11:11:47 | UserToken | semmle.label | UserToken |
+| jwtDecode.js:11:11:11:19 | UserToken | semmle.label | UserToken |
 | jwtDecode.js:11:23:11:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtDecode.js:15:16:15:24 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:10:11:10:47 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:10:11:10:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:10:23:10:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtSimple.js:13:23:13:31 | UserToken | semmle.label | UserToken |
-| jwtSimple.js:25:11:25:47 | UserToken | semmle.label | UserToken |
+| jwtSimple.js:25:11:25:19 | UserToken | semmle.label | UserToken |
 | jwtSimple.js:25:23:25:47 | req.hea ... ization | semmle.label | req.hea ... ization |
 | jwtSimple.js:28:23:28:31 | UserToken | semmle.label | UserToken |
 subpaths
diff --git a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
index da02dc248485..8a0dabd4c59e 100644
--- a/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
+++ b/javascript/ql/test/experimental/Security/CWE-918/SSRF.expected
@@ -1,6 +1,6 @@
 edges
-| check-domain.js:16:9:16:27 | url | check-domain.js:17:13:17:15 | url | provenance |  |
-| check-domain.js:16:15:16:27 | req.query.url | check-domain.js:16:9:16:27 | url | provenance |  |
+| check-domain.js:16:9:16:11 | url | check-domain.js:17:13:17:15 | url | provenance |  |
+| check-domain.js:16:15:16:27 | req.query.url | check-domain.js:16:9:16:11 | url | provenance |  |
 | check-middleware.js:9:27:9:43 | req.query.tainted | check-middleware.js:9:13:9:43 | "test.c ... tainted | provenance |  |
 | check-path.js:19:27:19:43 | req.query.tainted | check-path.js:19:13:19:43 | 'test.c ... tainted | provenance |  |
 | check-path.js:23:27:23:43 | req.query.tainted | check-path.js:23:13:23:45 | `/addre ... inted}` | provenance |  |
@@ -16,13 +16,13 @@ edges
 | check-validator.js:15:29:15:45 | req.query.tainted | check-validator.js:15:15:15:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:27:29:27:45 | req.query.tainted | check-validator.js:27:15:27:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:50:29:50:45 | req.query.tainted | check-validator.js:50:15:50:45 | "test.c ... tainted | provenance |  |
-| check-validator.js:54:9:54:37 | numberURL | check-validator.js:62:29:62:37 | numberURL | provenance |  |
-| check-validator.js:54:21:54:37 | req.query.tainted | check-validator.js:54:9:54:37 | numberURL | provenance |  |
+| check-validator.js:54:9:54:17 | numberURL | check-validator.js:62:29:62:37 | numberURL | provenance |  |
+| check-validator.js:54:21:54:37 | req.query.tainted | check-validator.js:54:9:54:17 | numberURL | provenance |  |
 | check-validator.js:59:29:59:45 | req.query.tainted | check-validator.js:59:15:59:45 | "test.c ... tainted | provenance |  |
 | check-validator.js:62:29:62:37 | numberURL | check-validator.js:62:15:62:37 | "test.c ... mberURL | provenance |  |
 | check-validator.js:68:29:68:45 | req.query.tainted | check-validator.js:68:15:68:45 | "test.c ... tainted | provenance |  |
 nodes
-| check-domain.js:16:9:16:27 | url | semmle.label | url |
+| check-domain.js:16:9:16:11 | url | semmle.label | url |
 | check-domain.js:16:15:16:27 | req.query.url | semmle.label | req.query.url |
 | check-domain.js:17:13:17:15 | url | semmle.label | url |
 | check-domain.js:26:15:26:27 | req.query.url | semmle.label | req.query.url |
@@ -56,7 +56,7 @@ nodes
 | check-validator.js:27:29:27:45 | req.query.tainted | semmle.label | req.query.tainted |
 | check-validator.js:50:15:50:45 | "test.c ... tainted | semmle.label | "test.c ... tainted |
 | check-validator.js:50:29:50:45 | req.query.tainted | semmle.label | req.query.tainted |
-| check-validator.js:54:9:54:37 | numberURL | semmle.label | numberURL |
+| check-validator.js:54:9:54:17 | numberURL | semmle.label | numberURL |
 | check-validator.js:54:21:54:37 | req.query.tainted | semmle.label | req.query.tainted |
 | check-validator.js:59:15:59:45 | "test.c ... tainted | semmle.label | "test.c ... tainted |
 | check-validator.js:59:29:59:45 | req.query.tainted | semmle.label | req.query.tainted |
diff --git a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected b/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected
index 6c28b7105a18..ddebfa1d1c8a 100644
--- a/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected
+++ b/javascript/ql/test/experimental/Security/CWE-942/CorsPermissiveConfiguration.expected
@@ -1,16 +1,16 @@
 edges
-| apollo-test.js:8:9:8:59 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
-| apollo-test.js:8:9:8:59 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:59 | user_origin | provenance |  |
-| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:59 | user_origin | provenance |  |
+| apollo-test.js:8:9:8:19 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
+| apollo-test.js:8:9:8:19 | user_origin | apollo-test.js:26:25:26:35 | user_origin | provenance |  |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:19 | user_origin | provenance |  |
+| apollo-test.js:8:23:8:46 | url.par ... , true) | apollo-test.js:8:9:8:19 | user_origin | provenance |  |
 | apollo-test.js:8:33:8:39 | req.url | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
 | apollo-test.js:8:42:8:45 | true | apollo-test.js:8:23:8:46 | url.par ... , true) | provenance |  |
-| express-test.js:10:9:10:59 | user_origin | express-test.js:33:17:33:27 | user_origin | provenance |  |
-| express-test.js:10:23:10:46 | url.par ... , true) | express-test.js:10:9:10:59 | user_origin | provenance |  |
+| express-test.js:10:9:10:19 | user_origin | express-test.js:33:17:33:27 | user_origin | provenance |  |
+| express-test.js:10:23:10:46 | url.par ... , true) | express-test.js:10:9:10:19 | user_origin | provenance |  |
 | express-test.js:10:33:10:39 | req.url | express-test.js:10:23:10:46 | url.par ... , true) | provenance |  |
 nodes
-| apollo-test.js:8:9:8:59 | user_origin | semmle.label | user_origin |
-| apollo-test.js:8:9:8:59 | user_origin | semmle.label | user_origin |
+| apollo-test.js:8:9:8:19 | user_origin | semmle.label | user_origin |
+| apollo-test.js:8:9:8:19 | user_origin | semmle.label | user_origin |
 | apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
 | apollo-test.js:8:23:8:46 | url.par ... , true) | semmle.label | url.par ... , true) |
 | apollo-test.js:8:33:8:39 | req.url | semmle.label | req.url |
@@ -19,7 +19,7 @@ nodes
 | apollo-test.js:21:25:21:28 | null | semmle.label | null |
 | apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
 | apollo-test.js:26:25:26:35 | user_origin | semmle.label | user_origin |
-| express-test.js:10:9:10:59 | user_origin | semmle.label | user_origin |
+| express-test.js:10:9:10:19 | user_origin | semmle.label | user_origin |
 | express-test.js:10:23:10:46 | url.par ... , true) | semmle.label | url.par ... , true) |
 | express-test.js:10:33:10:39 | req.url | semmle.label | req.url |
 | express-test.js:26:17:26:19 | '*' | semmle.label | '*' |
diff --git a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
index 8185f693b227..1192c8ec8fb6 100644
--- a/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
+++ b/javascript/ql/test/library-tests/CallGraphs/FullTest/tests.expected
@@ -50,15 +50,15 @@ test_getAFunctionValue
 | c.js:2:8:2:24 | function bar() {} | c.js:2:8:2:24 | function bar() {} |
 | classes.js:1:1:19:2 | (functi ... o();\\n}) | classes.js:1:2:19:1 | functio ... lo();\\n} |
 | classes.js:1:2:19:1 | functio ... lo();\\n} | classes.js:1:2:19:1 | functio ... lo();\\n} |
-| classes.js:2:3:10:3 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:2:3:10:3 | class A ...   }\\n  } | classes.js:2:11:2:10 | () {} |
+| classes.js:2:9:2:9 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:2:11:2:10 | () {} | classes.js:2:11:2:10 | () {} |
 | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } |
 | classes.js:7:6:9:5 | () {\\n   ... ;\\n    } | classes.js:7:6:9:5 | () {\\n   ... ;\\n    } |
 | classes.js:8:7:8:16 | this.hello | classes.js:3:10:5:5 | () {\\n   ... ;\\n    } |
 | classes.js:8:7:8:16 | this.hello | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } |
-| classes.js:12:3:16:3 | B | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:12:3:16:3 | class B ...   }\\n  } | classes.js:12:21:12:20 | (...arg ... rgs); } |
+| classes.js:12:9:12:9 | B | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:12:19:12:19 | A | classes.js:2:11:2:10 | () {} |
 | classes.js:12:21:12:20 | (...arg ... rgs); } | classes.js:12:21:12:20 | (...arg ... rgs); } |
 | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } | classes.js:13:10:15:5 | () {\\n   ... ;\\n    } |
@@ -146,9 +146,9 @@ test_getAFunctionValue
 | tst.js:11:1:20:1 | functio ... \\tf();\\n} | tst.js:11:1:20:1 | functio ... \\tf();\\n} |
 | tst.js:11:12:11:12 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:11:12:11:12 | m | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:6 | m | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:27 | n | tst.js:2:9:2:21 | function() {} |
-| tst.js:12:6:12:27 | n | tst.js:12:15:12:27 | function() {} |
+| tst.js:12:6:12:6 | n | tst.js:2:9:2:21 | function() {} |
+| tst.js:12:6:12:6 | n | tst.js:12:15:12:27 | function() {} |
+| tst.js:12:6:12:27 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
 | tst.js:12:10:12:10 | m | tst.js:2:9:2:21 | function() {} |
diff --git a/javascript/ql/test/library-tests/DataFlow/tests.expected b/javascript/ql/test/library-tests/DataFlow/tests.expected
index 26ba8c46a993..7655c8b9f84c 100644
--- a/javascript/ql/test/library-tests/DataFlow/tests.expected
+++ b/javascript/ql/test/library-tests/DataFlow/tests.expected
@@ -19,8 +19,8 @@ basicBlock
 | arguments.js:1:2:12:1 | exceptional return of anonymous function | arguments.js:1:2:1:1 | entry node of functio ... , 3);\\n} |
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:1:0 | entry node of <toplevel> |
 | arguments.js:1:2:12:1 | return of anonymous function | arguments.js:1:2:1:1 | entry node of functio ... , 3);\\n} |
+| arguments.js:2:5:2:4 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:2:4 | this | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:2:5:2:5 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | [function self-reference] functio ... ;\\n    } | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:2:5:10:5 | exceptional return of function f | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -44,7 +44,7 @@ basicBlock
 | arguments.js:5:25:5:36 | arguments[1] | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:5:35:5:35 | 1 | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:13:6:16 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:6:13:6:28 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
+| arguments.js:6:13:6:16 | args | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:13:6:28 | args = arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:6:20:6:28 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:7:13:7:20 | thirdArg | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -53,7 +53,7 @@ basicBlock
 | arguments.js:7:24:7:30 | args[2] | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:7:29:7:29 | 2 | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:9:8:17 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
-| arguments.js:8:9:8:22 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
+| arguments.js:8:9:8:17 | arguments | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:9:8:22 | arguments = {} | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:8:21:8:22 | {} | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
 | arguments.js:9:13:9:23 | notFirstArg | arguments.js:2:5:2:4 | entry node of functio ... ;\\n    } |
@@ -75,7 +75,7 @@ basicBlock
 | eval.js:1:1:5:1 | return of function k | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:1:10:1:10 | k | eval.js:1:1:1:0 | entry node of <toplevel> |
 | eval.js:2:7:2:7 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
-| eval.js:2:7:2:12 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
+| eval.js:2:7:2:7 | x | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:2:7:2:12 | x = 42 | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:2:11:2:12 | 42 | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
 | eval.js:3:3:3:6 | eval | eval.js:1:1:1:0 | entry node of functio ... eval`\\n} |
@@ -122,23 +122,23 @@ basicBlock
 | sources.js:10:12:10:14 | key | sources.js:10:8:10:14 | let key |
 | sources.js:10:19:10:23 | array | sources.js:9:1:9:0 | entry node of functio ... ey; }\\n} |
 | sources.js:10:28:10:30 | key | sources.js:10:8:10:14 | let key |
-| sources.js:11:12:11:18 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:12:11:18 | { key } | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:12:11:18 | { key } | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
+| sources.js:11:14:11:16 | key | sources.js:11:8:11:18 | let { key } |
 | sources.js:11:23:11:27 | array | sources.js:11:23:11:27 | array |
 | sources.js:11:32:11:34 | key | sources.js:11:8:11:18 | let { key } |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:1:1:0 | this | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:1:8:5:1 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
+| tst2.ts:1:18:1:18 | A | tst2.ts:1:1:1:0 | entry node of <toplevel> |
+| tst2.ts:2:14:2:14 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:14:2:14 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
-| tst2.ts:2:14:2:19 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:14:2:19 | x = 42 | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:2:18:2:19 | 42 | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:3:3:3:6 | setX | tst2.ts:1:1:1:0 | entry node of <toplevel> |
@@ -190,17 +190,17 @@ basicBlock
 | tst2.ts:15:11:15:30 | A.x satisfies number | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst2.ts:15:13:15:13 | x | tst2.ts:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:1:1:0 | this | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:1:1:1:1 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:1:1:1:0 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:1:1:24 | import  ... m 'fs'; | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:10:1:11 | fs | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:1:10:1:11 | fs | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:3:5:3:10 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:3:5:3:5 | x | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:5:3:10 | x = 42 | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:3:9:3:10 | 42 | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:5:4:5 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
-| tst.js:4:5:4:12 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
+| tst.js:4:5:4:5 | y | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:5:4:12 | y = "hi" | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:4:9:4:12 | "hi" | tst.js:1:1:1:0 | entry node of <toplevel> |
 | tst.js:5:5:5:5 | z | tst.js:1:1:1:0 | entry node of <toplevel> |
@@ -220,13 +220,13 @@ basicBlock
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | guard: x is false |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | guard: x is true |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:7 | x \|\| y; |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:7 | x \|\| y; |
 | tst.js:12:1:12:6 | x \|\| y | tst.js:12:1:12:7 | x \|\| y; |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:7 | x \|\| y; |
 | tst.js:12:6:12:6 | y | tst.js:12:1:12:1 | guard: x is false |
-| tst.js:13:1:13:1 | x | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:1:13:1 | z | tst.js:13:1:13:6 | z = y; |
-| tst.js:13:1:13:5 | z | tst.js:13:1:13:6 | z = y; |
+| tst.js:13:1:13:1 | z | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:1:13:5 | z = y | tst.js:13:1:13:6 | z = y; |
+| tst.js:13:1:13:6 | x | tst.js:13:1:13:6 | z = y; |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:6 | z = y; |
 | tst.js:14:1:14:1 | z | tst.js:13:1:13:6 | z = y; |
 | tst.js:14:1:14:9 | z ? x : y | tst.js:13:1:13:6 | z = y; |
@@ -254,16 +254,16 @@ basicBlock
 | tst.js:19:10:19:11 | "" | tst.js:17:7:17:25 | guard: Math.random() > 0.5 is false |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:5:22:20 | { readFileSync } | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:22:5:22:25 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:5:22:25 | { readF ...  } = fs | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:22:7:22:18 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:22:24:22:25 | fs | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:23:1:23:12 | readFileSync | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:25:1:25:3 | ++x | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:25:1:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:25:3:25:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:26:1:26:1 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -290,7 +290,7 @@ basicBlock
 | tst.js:35:1:35:7 | g(true) | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:35:3:35:6 | true | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:5:37:5 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:37:5:42:1 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:37:5:37:5 | o | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:5:42:1 | o = {\\n  ... ;\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:38:3:38:3 | x | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -318,9 +318,9 @@ basicBlock
 | tst.js:46:1:46:11 | global = "" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:46:10:46:11 | "" | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:47:1:47:6 | global | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:49:1:54:1 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:7:49:7 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:49:7:49:7 | A | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:49:17:49:17 | B | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:50:3:50:13 | constructor | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:50:3:53:3 | constru ... et`\\n  } | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -365,7 +365,7 @@ basicBlock
 | tst.js:66:7:66:25 | tmp = function.sent | tst.js:64:1:64:0 | entry node of functio ... lysed\\n} |
 | tst.js:66:13:66:25 | function.sent | tst.js:64:1:64:0 | entry node of functio ... lysed\\n} |
 | tst.js:68:5:68:8 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
-| tst.js:68:5:68:14 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
+| tst.js:68:5:68:8 | iter | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:5:68:14 | iter = h() | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:12:68:12 | h | tst.js:16:1:20:10 | (functi ... "arg"); |
 | tst.js:68:12:68:14 | exceptional return of h() | tst.js:16:1:20:10 | (functi ... "arg"); |
@@ -424,33 +424,33 @@ basicBlock
 | tst.js:87:2:92:1 | exceptional return of anonymous function | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:87:2:92:1 | return of anonymous function | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:87:11:87:24 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:87:11:87:24 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:11:87:24 | { p: x, ...o } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:13 | p | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:16 | p: x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:13:87:16 | p: x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:16:87:16 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:87:16:87:16 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:22:87:22 | ...o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:87:22:87:22 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:87:22:87:22 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:7:88:14 | { q: y } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:88:7:88:18 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:7:88:18 | { q: y } = o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:9 | q | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:12 | q: y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:9:88:12 | q: y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:12:88:12 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:88:12:88:12 | y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:88:18:88:18 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:89:7:89:7 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:3:90:16 | ({ r: z } = o) | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:11 | { r: z } | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
-| tst.js:90:4:90:15 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:6 | r | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:9 | r: z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:6:90:9 | r: z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:9:90:9 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
+| tst.js:90:9:90:9 | z | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:90:15:90:15 | o | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:91:10:91:10 | x | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
 | tst.js:91:10:91:14 | x + y | tst.js:87:2:87:1 | entry node of functio ...  + z;\\n} |
@@ -479,15 +479,15 @@ basicBlock
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:85:5:85:28 | vs2 = ( ...  o) v ) |
 | tst.js:98:2:103:1 | return of anonymous function | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:11:98:24 | [ x, ...rest ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:98:11:98:24 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:98:11:98:24 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:13:98:13 | x | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:19:98:22 | ...rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:98:19:98:22 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:98:19:98:22 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:7:99:11 | [ y ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:7:99:18 | [ y ] = rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:99:7:99:18 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:9:99:9 | y | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:99:15:99:18 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
@@ -495,7 +495,7 @@ basicBlock
 | tst.js:100:7:100:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:3:101:9 | [ , z ] | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:3:101:16 | [ , z ] = rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
-| tst.js:101:3:101:16 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
+| tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:7:101:7 | z | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
 | tst.js:101:13:101:16 | rest | tst.js:98:2:98:1 | entry node of functio ...  + z;\\n} |
@@ -521,14 +521,13 @@ basicBlock
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:3 | (functi ... 2c;\\n}); |
 | tst.js:107:2:113:1 | return of anonymous function | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:6:108:32 | {v1a, v ...  = o1c} | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:108:6:108:38 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:6:108:38 | {v1a, v ... } = o1d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:7:108:9 | v1a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:14 | v1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:12:108:20 | v1b = o1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -536,6 +535,7 @@ basicBlock
 | tst.js:108:18:108:20 | o1b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:108:23:108:25 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:31 | v1c = o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:23:108:31 | v1c = o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:108:29:108:31 | o1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -547,16 +547,16 @@ basicBlock
 | tst.js:109:14:109:16 | v1c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:6:111:32 | [v2a, v ...  = o2c] | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:6:111:38 | [v2a, v ... ] = o2d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
-| tst.js:111:6:111:38 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:7:111:9 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:12:111:14 | v2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:18:111:20 | o2b | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
+| tst.js:111:23:111:25 | v2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:29:111:31 | o2c | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:111:36:111:38 | o2d | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
 | tst.js:112:2:112:4 | v2a | tst.js:107:2:107:1 | entry node of functio ...  v2c;\\n} |
@@ -946,9 +946,9 @@ enclosingExpr
 | tst.js:117:22:117:23 | x1 | tst.js:117:22:117:23 | x1 |
 flowStep
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
-| arguments.js:2:5:2:5 | arguments | arguments.js:4:28:4:36 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:5:25:5:33 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:6:20:6:28 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:4:28:4:36 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:5:25:5:33 | arguments |
 | arguments.js:2:5:10:5 | 'arguments' object of function f | arguments.js:6:20:6:28 | arguments |
@@ -958,13 +958,13 @@ flowStep
 | arguments.js:2:14:2:14 | f | arguments.js:11:5:11:5 | f |
 | arguments.js:2:16:2:16 | x | arguments.js:2:16:2:16 | x |
 | arguments.js:2:16:2:16 | x | arguments.js:3:24:3:24 | x |
-| arguments.js:6:13:6:28 | args | arguments.js:7:24:7:27 | args |
-| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:28 | args |
-| arguments.js:8:9:8:22 | arguments | arguments.js:9:27:9:35 | arguments |
-| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments |
+| arguments.js:6:13:6:16 | args | arguments.js:7:24:7:27 | args |
+| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:16 | args |
+| arguments.js:8:9:8:17 | arguments | arguments.js:9:27:9:35 | arguments |
+| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:17 | arguments |
 | arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments = {} |
-| eval.js:2:7:2:12 | x | eval.js:4:3:4:3 | x |
-| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:12 | x |
+| eval.js:2:7:2:7 | x | eval.js:4:3:4:3 | x |
+| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
@@ -980,17 +980,17 @@ flowStep
 | sources.js:9:14:9:18 | array | sources.js:10:19:10:23 | array |
 | sources.js:9:14:9:18 | array | sources.js:11:23:11:27 | array |
 | sources.js:10:12:10:14 | key | sources.js:10:28:10:30 | key |
-| sources.js:11:12:11:18 | key | sources.js:11:32:11:34 | key |
-| sources.js:11:14:11:16 | key | sources.js:11:12:11:18 | key |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:11:11:11:11 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:15:11:15:11 | A |
-| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:8:5:1 | A |
+| sources.js:11:14:11:16 | key | sources.js:11:14:11:16 | key |
+| sources.js:11:14:11:16 | key | sources.js:11:32:11:34 | key |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:1:18:1:18 | A |
 | tst2.ts:1:18:1:18 | A | tst2.ts:7:1:7:0 | A |
-| tst2.ts:2:14:2:19 | x | tst2.ts:4:3:4:3 | x |
-| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:19 | x |
+| tst2.ts:1:18:1:18 | A | tst2.ts:11:11:11:11 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:15:11:15:11 | A |
+| tst2.ts:2:14:2:14 | x | tst2.ts:4:3:4:3 | x |
+| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:14 | x |
 | tst2.ts:7:1:7:0 | A | tst2.ts:8:3:8:3 | A |
 | tst2.ts:7:1:9:1 | functio ... = 23;\\n} | tst2.ts:7:10:7:13 | setX |
 | tst2.ts:7:10:7:13 | setX | tst2.ts:3:3:3:6 | setX |
@@ -1001,43 +1001,43 @@ flowStep
 | tst2.ts:13:39:13:38 | args | tst2.ts:13:39:13:38 | args |
 | tst2.ts:13:39:13:38 | this | tst2.ts:13:39:13:38 | implicit 'this' |
 | tst2.ts:15:11:15:13 | A.x | tst2.ts:15:11:15:30 | A.x satisfies number |
-| tst.js:1:1:1:1 | x | tst.js:3:5:3:5 | x |
+| tst.js:1:1:1:0 | x | tst.js:3:5:3:5 | x |
 | tst.js:1:10:1:11 | fs | tst.js:1:10:1:11 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:7:1:7:2 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:22:24:22:25 | fs |
+| tst.js:3:5:3:5 | x | tst.js:3:5:3:5 | x |
+| tst.js:3:5:3:5 | x | tst.js:8:1:8:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:9:2:9:2 | x |
+| tst.js:3:5:3:5 | x | tst.js:10:1:10:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
 | tst.js:3:5:3:5 | x | tst.js:28:2:28:1 | x |
 | tst.js:3:5:3:5 | x | tst.js:32:1:32:0 | x |
-| tst.js:3:5:3:10 | x | tst.js:3:5:3:5 | x |
-| tst.js:3:5:3:10 | x | tst.js:8:1:8:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:9:2:9:2 | x |
-| tst.js:3:5:3:10 | x | tst.js:10:1:10:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:10 | x |
-| tst.js:4:5:4:12 | y | tst.js:10:4:10:4 | y |
-| tst.js:4:5:4:12 | y | tst.js:11:6:11:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:12:6:12:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:13:5:13:5 | y |
-| tst.js:4:5:4:12 | y | tst.js:14:9:14:9 | y |
-| tst.js:4:5:4:12 | y | tst.js:105:6:105:6 | y |
-| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:12 | y |
+| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:5 | x |
+| tst.js:4:5:4:5 | y | tst.js:10:4:10:4 | y |
+| tst.js:4:5:4:5 | y | tst.js:11:6:11:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:12:6:12:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:13:5:13:5 | y |
+| tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
+| tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
+| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
 | tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
-| tst.js:11:1:11:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:11:1:11:1 | x | tst.js:12:1:12:1 | x |
+| tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
+| tst.js:11:1:11:1 | x | tst.js:12:1:12:7 | x |
 | tst.js:11:6:11:6 | y | tst.js:11:1:11:6 | x && y |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
 | tst.js:12:1:12:1 | x | tst.js:12:1:12:6 | x \|\| y |
-| tst.js:12:1:12:1 | x | tst.js:13:1:13:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:13:1:13:1 | x |
+| tst.js:12:1:12:1 | x | tst.js:13:1:13:6 | x |
+| tst.js:12:1:12:1 | x | tst.js:13:1:13:6 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
 | tst.js:12:6:12:6 | y | tst.js:12:1:12:6 | x \|\| y |
-| tst.js:13:1:13:1 | x | tst.js:14:5:14:5 | x |
-| tst.js:13:1:13:1 | x | tst.js:25:3:25:3 | x |
-| tst.js:13:1:13:5 | z | tst.js:14:1:14:1 | z |
-| tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z |
+| tst.js:13:1:13:1 | z | tst.js:14:1:14:1 | z |
+| tst.js:13:1:13:6 | x | tst.js:14:5:14:5 | x |
+| tst.js:13:1:13:6 | x | tst.js:25:3:25:3 | x |
+| tst.js:13:5:13:5 | y | tst.js:13:1:13:1 | z |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
 | tst.js:14:5:14:5 | x | tst.js:14:1:14:9 | z ? x : y |
 | tst.js:14:9:14:9 | y | tst.js:14:1:14:9 | z ? x : y |
@@ -1049,14 +1049,14 @@ flowStep
 | tst.js:19:10:19:11 | "" | tst.js:16:1:20:9 | (functi ... ("arg") |
 | tst.js:19:10:19:11 | "" | tst.js:16:2:20:1 | return of function f |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:13:16:13 | a |
-| tst.js:22:5:22:25 | readFileSync | tst.js:23:1:23:12 | readFileSync |
-| tst.js:22:7:22:18 | readFileSync | tst.js:22:5:22:25 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:22:7:22:18 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:23:1:23:12 | readFileSync |
 | tst.js:22:24:22:25 | fs | tst.js:22:5:22:20 | { readFileSync } |
-| tst.js:25:1:25:3 | x | tst.js:3:5:3:5 | x |
-| tst.js:25:1:25:3 | x | tst.js:26:1:26:1 | x |
-| tst.js:25:1:25:3 | x | tst.js:57:7:57:7 | x |
-| tst.js:25:1:25:3 | x | tst.js:58:11:58:11 | x |
-| tst.js:25:1:25:3 | x | tst.js:105:1:105:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:3:5:3:5 | x |
+| tst.js:25:3:25:3 | x | tst.js:26:1:26:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:57:7:57:7 | x |
+| tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
+| tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
 | tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
@@ -1067,56 +1067,56 @@ flowStep
 | tst.js:32:10:32:10 | g | tst.js:60:1:60:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:62:4:62:4 | g |
 | tst.js:33:10:33:10 | x | tst.js:32:1:34:1 | return of function g |
-| tst.js:37:5:42:1 | o | tst.js:43:1:43:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:44:1:44:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:61:3:61:3 | o |
-| tst.js:37:5:42:1 | o | tst.js:62:1:62:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:77:15:77:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:80:15:80:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:83:23:83:23 | o |
-| tst.js:37:5:42:1 | o | tst.js:85:23:85:23 | o |
-| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:42:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:43:1:43:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:44:1:44:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:61:3:61:3 | o |
+| tst.js:37:5:37:5 | o | tst.js:62:1:62:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:77:15:77:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:80:15:80:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:83:23:83:23 | o |
+| tst.js:37:5:37:5 | o | tst.js:85:23:85:23 | o |
+| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:37:5 | o |
 | tst.js:39:4:39:3 | this | tst.js:40:5:40:8 | this |
 | tst.js:46:10:46:11 | "" | tst.js:46:1:46:11 | global = "" |
-| tst.js:49:1:54:1 | A | tst.js:55:1:55:1 | A |
-| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:1:54:1 | A |
+| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:7:49:7 | A |
+| tst.js:49:7:49:7 | A | tst.js:55:1:55:1 | A |
 | tst.js:50:14:50:13 | this | tst.js:51:5:51:9 | implicit 'this' |
 | tst.js:64:1:67:1 | functio ... lysed\\n} | tst.js:64:11:64:11 | h |
 | tst.js:64:11:64:11 | h | tst.js:68:12:68:12 | h |
-| tst.js:68:5:68:14 | iter | tst.js:69:1:69:4 | iter |
-| tst.js:68:12:68:14 | h() | tst.js:68:5:68:14 | iter |
+| tst.js:68:5:68:8 | iter | tst.js:69:1:69:4 | iter |
+| tst.js:68:12:68:14 | h() | tst.js:68:5:68:8 | iter |
 | tst.js:77:10:77:10 | i | tst.js:78:3:78:3 | i |
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
-| tst.js:87:11:87:24 | o | tst.js:88:18:88:18 | o |
-| tst.js:87:11:87:24 | o | tst.js:90:15:90:15 | o |
-| tst.js:87:11:87:24 | x | tst.js:91:10:91:10 | x |
-| tst.js:87:13:87:16 | p: x | tst.js:87:11:87:24 | x |
-| tst.js:87:22:87:22 | ...o | tst.js:87:11:87:24 | o |
-| tst.js:88:7:88:18 | y | tst.js:91:14:91:14 | y |
-| tst.js:88:9:88:12 | q: y | tst.js:88:7:88:18 | y |
+| tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
+| tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
+| tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
+| tst.js:87:22:87:22 | o | tst.js:88:18:88:18 | o |
+| tst.js:87:22:87:22 | o | tst.js:90:15:90:15 | o |
+| tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
+| tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
-| tst.js:90:6:90:9 | r: z | tst.js:90:4:90:15 | z |
+| tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
+| tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:2:92:1 | return of anonymous function |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
-| tst.js:98:11:98:24 | rest | tst.js:99:15:99:18 | rest |
-| tst.js:98:11:98:24 | rest | tst.js:101:13:101:16 | rest |
-| tst.js:98:11:98:24 | x | tst.js:102:10:102:10 | x |
-| tst.js:98:13:98:13 | x | tst.js:98:11:98:24 | x |
-| tst.js:98:19:98:22 | ...rest | tst.js:98:11:98:24 | rest |
-| tst.js:99:7:99:18 | y | tst.js:102:14:102:14 | y |
-| tst.js:99:9:99:9 | y | tst.js:99:7:99:18 | y |
+| tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
+| tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
+| tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:99:15:99:18 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:101:13:101:16 | rest |
+| tst.js:99:9:99:9 | y | tst.js:99:9:99:9 | y |
+| tst.js:99:9:99:9 | y | tst.js:102:14:102:14 | y |
 | tst.js:99:15:99:18 | rest | tst.js:99:7:99:11 | [ y ] |
-| tst.js:101:3:101:16 | z | tst.js:102:18:102:18 | z |
-| tst.js:101:7:101:7 | z | tst.js:101:3:101:16 | z |
+| tst.js:101:7:101:7 | z | tst.js:101:7:101:7 | z |
+| tst.js:101:7:101:7 | z | tst.js:102:18:102:18 | z |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:9 | [ , z ] |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:16 | [ , z ] = rest |
 | tst.js:102:10:102:18 | x + y + z | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
@@ -1125,41 +1125,41 @@ flowStep
 | tst.js:105:1:105:1 | x | tst.js:105:1:105:6 | x ?? y |
 | tst.js:105:6:105:6 | y | tst.js:105:1:105:6 | x ?? y |
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
-| tst.js:108:6:108:38 | v1a | tst.js:109:2:109:4 | v1a |
-| tst.js:108:6:108:38 | v1b | tst.js:109:8:109:10 | v1b |
-| tst.js:108:6:108:38 | v1c | tst.js:109:14:109:16 | v1c |
-| tst.js:108:7:108:9 | v1a | tst.js:108:6:108:38 | v1a |
-| tst.js:108:12:108:20 | v1b = o1b | tst.js:108:6:108:38 | v1b |
-| tst.js:108:18:108:20 | o1b | tst.js:108:6:108:38 | v1b |
-| tst.js:108:23:108:31 | v1c = o1c | tst.js:108:6:108:38 | v1c |
-| tst.js:108:29:108:31 | o1c | tst.js:108:6:108:38 | v1c |
+| tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
+| tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
+| tst.js:108:12:108:20 | v1b = o1b | tst.js:108:12:108:14 | v1b |
+| tst.js:108:18:108:20 | o1b | tst.js:108:12:108:14 | v1b |
+| tst.js:108:23:108:25 | v1c | tst.js:109:14:109:16 | v1c |
+| tst.js:108:23:108:31 | v1c = o1c | tst.js:108:23:108:25 | v1c |
+| tst.js:108:29:108:31 | o1c | tst.js:108:23:108:25 | v1c |
 | tst.js:108:36:108:38 | o1d | tst.js:108:6:108:32 | {v1a, v ...  = o1c} |
-| tst.js:111:6:111:38 | v2a | tst.js:112:2:112:4 | v2a |
-| tst.js:111:6:111:38 | v2b | tst.js:112:8:112:10 | v2b |
-| tst.js:111:6:111:38 | v2c | tst.js:112:14:112:16 | v2c |
-| tst.js:111:7:111:9 | v2a | tst.js:111:6:111:38 | v2a |
-| tst.js:111:12:111:14 | v2b | tst.js:111:6:111:38 | v2b |
-| tst.js:111:18:111:20 | o2b | tst.js:111:6:111:38 | v2b |
-| tst.js:111:23:111:25 | v2c | tst.js:111:6:111:38 | v2c |
-| tst.js:111:29:111:31 | o2c | tst.js:111:6:111:38 | v2c |
+| tst.js:111:7:111:9 | v2a | tst.js:111:7:111:9 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:112:2:112:4 | v2a |
+| tst.js:111:12:111:14 | v2b | tst.js:111:12:111:14 | v2b |
+| tst.js:111:12:111:14 | v2b | tst.js:112:8:112:10 | v2b |
+| tst.js:111:18:111:20 | o2b | tst.js:111:12:111:14 | v2b |
+| tst.js:111:23:111:25 | v2c | tst.js:111:23:111:25 | v2c |
+| tst.js:111:23:111:25 | v2c | tst.js:112:14:112:16 | v2c |
+| tst.js:111:29:111:31 | o2c | tst.js:111:23:111:25 | v2c |
 | tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ...  = o2c] |
 | tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
 getImmediatePredecessor
 | arguments.js:1:2:12:1 | functio ... , 3);\\n} | arguments.js:1:1:12:2 | (functi ...  3);\\n}) |
-| arguments.js:2:5:2:5 | arguments | arguments.js:4:28:4:36 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:5:25:5:33 | arguments |
-| arguments.js:2:5:2:5 | arguments | arguments.js:6:20:6:28 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:4:28:4:36 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:5:25:5:33 | arguments |
+| arguments.js:2:5:2:4 | arguments | arguments.js:6:20:6:28 | arguments |
 | arguments.js:2:5:10:5 | functio ... ;\\n    } | arguments.js:2:14:2:14 | f |
 | arguments.js:2:14:2:14 | f | arguments.js:11:5:11:5 | f |
 | arguments.js:2:16:2:16 | x | arguments.js:2:16:2:16 | x |
 | arguments.js:2:16:2:16 | x | arguments.js:3:24:3:24 | x |
-| arguments.js:6:13:6:28 | args | arguments.js:7:24:7:27 | args |
-| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:28 | args |
-| arguments.js:8:9:8:22 | arguments | arguments.js:9:27:9:35 | arguments |
-| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments |
+| arguments.js:6:13:6:16 | args | arguments.js:7:24:7:27 | args |
+| arguments.js:6:20:6:28 | arguments | arguments.js:6:13:6:16 | args |
+| arguments.js:8:9:8:17 | arguments | arguments.js:9:27:9:35 | arguments |
+| arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:17 | arguments |
 | arguments.js:8:21:8:22 | {} | arguments.js:8:9:8:22 | arguments = {} |
-| eval.js:2:7:2:12 | x | eval.js:4:3:4:3 | x |
-| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:12 | x |
+| eval.js:2:7:2:7 | x | eval.js:4:3:4:3 | x |
+| eval.js:2:11:2:12 | 42 | eval.js:2:7:2:7 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:6:1:6 | x |
 | sources.js:1:6:1:6 | x | sources.js:1:11:1:11 | x |
 | sources.js:1:6:1:11 | x => x | sources.js:1:5:1:12 | (x => x) |
@@ -1173,14 +1173,14 @@ getImmediatePredecessor
 | sources.js:9:14:9:18 | array | sources.js:10:19:10:23 | array |
 | sources.js:9:14:9:18 | array | sources.js:11:23:11:27 | array |
 | sources.js:10:12:10:14 | key | sources.js:10:28:10:30 | key |
-| sources.js:11:12:11:18 | key | sources.js:11:32:11:34 | key |
-| sources.js:11:14:11:16 | key | sources.js:11:12:11:18 | key |
-| tst2.ts:1:1:1:1 | A | tst2.ts:1:18:1:18 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:11:11:11:11 | A |
-| tst2.ts:1:8:5:1 | A | tst2.ts:15:11:15:11 | A |
-| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:8:5:1 | A |
-| tst2.ts:2:14:2:19 | x | tst2.ts:4:3:4:3 | x |
-| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:19 | x |
+| sources.js:11:14:11:16 | key | sources.js:11:14:11:16 | key |
+| sources.js:11:14:11:16 | key | sources.js:11:32:11:34 | key |
+| tst2.ts:1:1:1:0 | A | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:8:5:1 | namespa ... lysed\\n} | tst2.ts:1:18:1:18 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:11:11:11:11 | A |
+| tst2.ts:1:18:1:18 | A | tst2.ts:15:11:15:11 | A |
+| tst2.ts:2:14:2:14 | x | tst2.ts:4:3:4:3 | x |
+| tst2.ts:2:18:2:19 | 42 | tst2.ts:2:14:2:14 | x |
 | tst2.ts:7:1:7:0 | A | tst2.ts:8:3:8:3 | A |
 | tst2.ts:7:1:9:1 | functio ... = 23;\\n} | tst2.ts:7:10:7:13 | setX |
 | tst2.ts:7:10:7:13 | setX | tst2.ts:3:3:3:6 | setX |
@@ -1194,43 +1194,43 @@ getImmediatePredecessor
 | tst.js:1:10:1:11 | fs | tst.js:1:10:1:11 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:7:1:7:2 | fs |
 | tst.js:1:10:1:11 | fs | tst.js:22:24:22:25 | fs |
-| tst.js:3:5:3:10 | x | tst.js:8:1:8:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:9:2:9:2 | x |
-| tst.js:3:5:3:10 | x | tst.js:10:1:10:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:11:1:11:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:12:1:12:1 | x |
-| tst.js:3:5:3:10 | x | tst.js:13:1:13:1 | x |
-| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:10 | x |
-| tst.js:4:5:4:12 | y | tst.js:10:4:10:4 | y |
-| tst.js:4:5:4:12 | y | tst.js:11:6:11:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:12:6:12:6 | y |
-| tst.js:4:5:4:12 | y | tst.js:13:5:13:5 | y |
-| tst.js:4:5:4:12 | y | tst.js:14:9:14:9 | y |
-| tst.js:4:5:4:12 | y | tst.js:105:6:105:6 | y |
-| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:12 | y |
+| tst.js:3:5:3:5 | x | tst.js:8:1:8:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:9:2:9:2 | x |
+| tst.js:3:5:3:5 | x | tst.js:10:1:10:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:11:1:11:1 | x |
+| tst.js:3:5:3:5 | x | tst.js:12:1:12:7 | x |
+| tst.js:3:5:3:5 | x | tst.js:13:1:13:6 | x |
+| tst.js:3:9:3:10 | 42 | tst.js:3:5:3:5 | x |
+| tst.js:4:5:4:5 | y | tst.js:10:4:10:4 | y |
+| tst.js:4:5:4:5 | y | tst.js:11:6:11:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:12:6:12:6 | y |
+| tst.js:4:5:4:5 | y | tst.js:13:5:13:5 | y |
+| tst.js:4:5:4:5 | y | tst.js:14:9:14:9 | y |
+| tst.js:4:5:4:5 | y | tst.js:105:6:105:6 | y |
+| tst.js:4:9:4:12 | "hi" | tst.js:4:5:4:5 | y |
 | tst.js:9:2:9:2 | x | tst.js:9:1:9:3 | (x) |
 | tst.js:10:4:10:4 | y | tst.js:10:1:10:4 | x, y |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:12:1:12:1 | x | tst.js:12:1:12:1 | x |
-| tst.js:13:1:13:1 | x | tst.js:14:5:14:5 | x |
-| tst.js:13:1:13:1 | x | tst.js:25:3:25:3 | x |
-| tst.js:13:1:13:5 | z | tst.js:14:1:14:1 | z |
-| tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:12:1:12:7 | x | tst.js:12:1:12:1 | x |
+| tst.js:13:1:13:1 | z | tst.js:14:1:14:1 | z |
+| tst.js:13:1:13:6 | x | tst.js:14:5:14:5 | x |
+| tst.js:13:1:13:6 | x | tst.js:25:3:25:3 | x |
+| tst.js:13:5:13:5 | y | tst.js:13:1:13:1 | z |
 | tst.js:13:5:13:5 | y | tst.js:13:1:13:5 | z = y |
 | tst.js:16:2:20:1 | functio ... n "";\\n} | tst.js:16:1:20:2 | (functi ...  "";\\n}) |
 | tst.js:16:13:16:13 | a | tst.js:16:13:16:13 | a |
 | tst.js:16:13:16:13 | a | tst.js:18:12:18:12 | a |
 | tst.js:20:4:20:8 | "arg" | tst.js:16:13:16:13 | a |
-| tst.js:22:5:22:25 | readFileSync | tst.js:23:1:23:12 | readFileSync |
-| tst.js:22:7:22:18 | readFileSync | tst.js:22:5:22:25 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:22:7:22:18 | readFileSync |
+| tst.js:22:7:22:18 | readFileSync | tst.js:23:1:23:12 | readFileSync |
 | tst.js:22:24:22:25 | fs | tst.js:22:5:22:20 | { readFileSync } |
-| tst.js:25:1:25:3 | x | tst.js:26:1:26:1 | x |
-| tst.js:25:1:25:3 | x | tst.js:57:7:57:7 | x |
-| tst.js:25:1:25:3 | x | tst.js:58:11:58:11 | x |
-| tst.js:25:1:25:3 | x | tst.js:105:1:105:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:26:1:26:1 | x |
+| tst.js:25:3:25:3 | x | tst.js:57:7:57:7 | x |
+| tst.js:25:3:25:3 | x | tst.js:58:11:58:11 | x |
+| tst.js:25:3:25:3 | x | tst.js:105:1:105:1 | x |
 | tst.js:28:2:28:1 | x | tst.js:29:3:29:3 | x |
 | tst.js:28:2:29:3 | () =>\\n  x | tst.js:28:1:30:1 | (() =>\\n ... ables\\n) |
 | tst.js:29:3:29:3 | x | tst.js:28:1:30:3 | (() =>\\n ... les\\n)() |
@@ -1239,69 +1239,69 @@ getImmediatePredecessor
 | tst.js:32:10:32:10 | g | tst.js:35:1:35:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:60:1:60:1 | g |
 | tst.js:32:10:32:10 | g | tst.js:62:4:62:4 | g |
-| tst.js:37:5:42:1 | o | tst.js:43:1:43:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:44:1:44:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:61:3:61:3 | o |
-| tst.js:37:5:42:1 | o | tst.js:62:1:62:1 | o |
-| tst.js:37:5:42:1 | o | tst.js:77:15:77:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:80:15:80:15 | o |
-| tst.js:37:5:42:1 | o | tst.js:83:23:83:23 | o |
-| tst.js:37:5:42:1 | o | tst.js:85:23:85:23 | o |
-| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:42:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:43:1:43:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:44:1:44:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:61:3:61:3 | o |
+| tst.js:37:5:37:5 | o | tst.js:62:1:62:1 | o |
+| tst.js:37:5:37:5 | o | tst.js:77:15:77:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:80:15:80:15 | o |
+| tst.js:37:5:37:5 | o | tst.js:83:23:83:23 | o |
+| tst.js:37:5:37:5 | o | tst.js:85:23:85:23 | o |
+| tst.js:37:9:42:1 | {\\n  x:  ... ;\\n  }\\n} | tst.js:37:5:37:5 | o |
 | tst.js:39:4:39:3 | this | tst.js:40:5:40:8 | this |
 | tst.js:46:10:46:11 | "" | tst.js:46:1:46:11 | global = "" |
-| tst.js:49:1:54:1 | A | tst.js:55:1:55:1 | A |
-| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:1:54:1 | A |
+| tst.js:49:1:54:1 | class A ... `\\n  }\\n} | tst.js:49:7:49:7 | A |
+| tst.js:49:7:49:7 | A | tst.js:55:1:55:1 | A |
 | tst.js:50:14:50:13 | this | tst.js:51:5:51:9 | implicit 'this' |
 | tst.js:64:1:67:1 | functio ... lysed\\n} | tst.js:64:11:64:11 | h |
 | tst.js:64:11:64:11 | h | tst.js:68:12:68:12 | h |
-| tst.js:68:5:68:14 | iter | tst.js:69:1:69:4 | iter |
-| tst.js:68:12:68:14 | h() | tst.js:68:5:68:14 | iter |
+| tst.js:68:5:68:8 | iter | tst.js:69:1:69:4 | iter |
+| tst.js:68:12:68:14 | h() | tst.js:68:5:68:8 | iter |
 | tst.js:77:10:77:10 | i | tst.js:78:3:78:3 | i |
 | tst.js:80:10:80:10 | v | tst.js:81:3:81:3 | v |
 | tst.js:83:18:83:18 | v | tst.js:83:26:83:26 | v |
 | tst.js:85:18:85:18 | v | tst.js:85:26:85:26 | v |
 | tst.js:87:2:92:1 | functio ...  + z;\\n} | tst.js:87:1:92:2 | (functi ... + z;\\n}) |
-| tst.js:87:11:87:24 | o | tst.js:88:18:88:18 | o |
-| tst.js:87:11:87:24 | o | tst.js:90:15:90:15 | o |
-| tst.js:87:11:87:24 | x | tst.js:91:10:91:10 | x |
-| tst.js:87:13:87:16 | p: x | tst.js:87:11:87:24 | x |
-| tst.js:87:22:87:22 | ...o | tst.js:87:11:87:24 | o |
-| tst.js:88:7:88:18 | y | tst.js:91:14:91:14 | y |
-| tst.js:88:9:88:12 | q: y | tst.js:88:7:88:18 | y |
+| tst.js:87:13:87:16 | p: x | tst.js:87:16:87:16 | x |
+| tst.js:87:16:87:16 | x | tst.js:91:10:91:10 | x |
+| tst.js:87:22:87:22 | ...o | tst.js:87:22:87:22 | o |
+| tst.js:87:22:87:22 | o | tst.js:88:18:88:18 | o |
+| tst.js:87:22:87:22 | o | tst.js:90:15:90:15 | o |
+| tst.js:88:9:88:12 | q: y | tst.js:88:12:88:12 | y |
+| tst.js:88:12:88:12 | y | tst.js:91:14:91:14 | y |
 | tst.js:88:18:88:18 | o | tst.js:88:7:88:14 | { q: y } |
-| tst.js:90:4:90:15 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:4:90:15 | { r: z } = o | tst.js:90:3:90:16 | ({ r: z } = o) |
-| tst.js:90:6:90:9 | r: z | tst.js:90:4:90:15 | z |
+| tst.js:90:6:90:9 | r: z | tst.js:90:9:90:9 | z |
+| tst.js:90:9:90:9 | z | tst.js:91:18:91:18 | z |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:11 | { r: z } |
 | tst.js:90:15:90:15 | o | tst.js:90:4:90:15 | { r: z } = o |
 | tst.js:91:10:91:18 | x + y + z | tst.js:87:1:96:2 | (functi ... r: 0\\n}) |
 | tst.js:92:4:96:1 | {\\n  p:  ...  r: 0\\n} | tst.js:87:11:87:24 | { p: x, ...o } |
 | tst.js:98:2:103:1 | functio ...  + z;\\n} | tst.js:98:1:103:2 | (functi ... + z;\\n}) |
-| tst.js:98:11:98:24 | rest | tst.js:99:15:99:18 | rest |
-| tst.js:98:11:98:24 | rest | tst.js:101:13:101:16 | rest |
-| tst.js:98:11:98:24 | x | tst.js:102:10:102:10 | x |
-| tst.js:98:13:98:13 | x | tst.js:98:11:98:24 | x |
-| tst.js:98:19:98:22 | ...rest | tst.js:98:11:98:24 | rest |
-| tst.js:99:7:99:18 | y | tst.js:102:14:102:14 | y |
-| tst.js:99:9:99:9 | y | tst.js:99:7:99:18 | y |
+| tst.js:98:13:98:13 | x | tst.js:98:13:98:13 | x |
+| tst.js:98:13:98:13 | x | tst.js:102:10:102:10 | x |
+| tst.js:98:19:98:22 | ...rest | tst.js:98:19:98:22 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:99:15:99:18 | rest |
+| tst.js:98:19:98:22 | rest | tst.js:101:13:101:16 | rest |
+| tst.js:99:9:99:9 | y | tst.js:99:9:99:9 | y |
+| tst.js:99:9:99:9 | y | tst.js:102:14:102:14 | y |
 | tst.js:99:15:99:18 | rest | tst.js:99:7:99:11 | [ y ] |
-| tst.js:101:3:101:16 | z | tst.js:102:18:102:18 | z |
-| tst.js:101:7:101:7 | z | tst.js:101:3:101:16 | z |
+| tst.js:101:7:101:7 | z | tst.js:101:7:101:7 | z |
+| tst.js:101:7:101:7 | z | tst.js:102:18:102:18 | z |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:9 | [ , z ] |
 | tst.js:101:13:101:16 | rest | tst.js:101:3:101:16 | [ , z ] = rest |
 | tst.js:102:10:102:18 | x + y + z | tst.js:98:1:103:17 | (functi ... 3, 0 ]) |
 | tst.js:103:4:103:16 | [ 19, 23, 0 ] | tst.js:98:11:98:24 | [ x, ...rest ] |
 | tst.js:107:2:113:1 | functio ...  v2c;\\n} | tst.js:107:1:113:2 | (functi ... v2c;\\n}) |
-| tst.js:108:6:108:38 | v1a | tst.js:109:2:109:4 | v1a |
-| tst.js:108:6:108:38 | v1b | tst.js:109:8:109:10 | v1b |
-| tst.js:108:6:108:38 | v1c | tst.js:109:14:109:16 | v1c |
-| tst.js:108:7:108:9 | v1a | tst.js:108:6:108:38 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:108:7:108:9 | v1a |
+| tst.js:108:7:108:9 | v1a | tst.js:109:2:109:4 | v1a |
+| tst.js:108:12:108:14 | v1b | tst.js:109:8:109:10 | v1b |
+| tst.js:108:23:108:25 | v1c | tst.js:109:14:109:16 | v1c |
 | tst.js:108:36:108:38 | o1d | tst.js:108:6:108:32 | {v1a, v ...  = o1c} |
-| tst.js:111:6:111:38 | v2a | tst.js:112:2:112:4 | v2a |
-| tst.js:111:6:111:38 | v2b | tst.js:112:8:112:10 | v2b |
-| tst.js:111:6:111:38 | v2c | tst.js:112:14:112:16 | v2c |
-| tst.js:111:7:111:9 | v2a | tst.js:111:6:111:38 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:111:7:111:9 | v2a |
+| tst.js:111:7:111:9 | v2a | tst.js:112:2:112:4 | v2a |
+| tst.js:111:12:111:14 | v2b | tst.js:112:8:112:10 | v2b |
+| tst.js:111:23:111:25 | v2c | tst.js:112:14:112:16 | v2c |
 | tst.js:111:36:111:38 | o2d | tst.js:111:6:111:32 | [v2a, v ...  = o2c] |
 | tst.js:115:1:115:12 | reflective call | tst.js:115:1:115:12 | Array.call() |
 | tst.js:117:22:117:23 | x1 | tst.js:117:10:117:24 | Object.seal(x1) |
@@ -1340,7 +1340,7 @@ incomplete
 | arguments.js:11:5:11:14 | exceptional return of f(1, 2, 3) | call |
 | arguments.js:11:5:11:14 | f(1, 2, 3) | call |
 | eval.js:1:1:5:1 | exceptional return of function k | call |
-| eval.js:2:7:2:12 | x | eval |
+| eval.js:2:7:2:7 | x | eval |
 | eval.js:3:3:3:6 | eval | global |
 | eval.js:3:3:3:16 | eval("x = 23") | call |
 | eval.js:3:3:3:16 | exceptional return of eval("x = 23") | call |
@@ -1351,9 +1351,9 @@ incomplete
 | sources.js:9:1:12:1 | exceptional return of function foo | call |
 | sources.js:9:14:9:18 | array | call |
 | sources.js:10:12:10:14 | key | heap |
-| sources.js:11:12:11:18 | key | heap |
 | sources.js:11:14:11:16 | key | heap |
-| tst2.ts:2:14:2:19 | x | namespace |
+| sources.js:11:14:11:16 | key | heap |
+| tst2.ts:2:14:2:14 | x | namespace |
 | tst2.ts:3:3:3:8 | exceptional return of setX() | call |
 | tst2.ts:3:3:3:8 | setX() | call |
 | tst2.ts:7:1:9:1 | exceptional return of function setX | call |
diff --git a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
index f029dd71b6cd..fe8ec09345bd 100644
--- a/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
+++ b/javascript/ql/test/library-tests/DefUse/DefUsePair.expected
@@ -1,9 +1,9 @@
-| classes.js:7:5:8:5 | def@7:5 | classes.js:10:5:10:12 | LocalFoo |
+| classes.js:7:11:7:18 | def@7:11 | classes.js:10:5:10:12 | LocalFoo |
 | es2015.js:1:10:1:11 | def@1:10 | es2015.js:2:3:2:4 | fn |
 | es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:32:5:32 | i |
 | es2015.js:5:16:5:16 | def@5:16 | es2015.js:5:34:5:34 | i |
 | es2015modules.js:1:10:1:12 | def@1:10 | es2015modules.js:4:3:4:5 | foo |
-| es2015modules.js:1:15:1:24 | def@1:15 | es2015modules.js:6:3:6:5 | baz |
+| es2015modules.js:1:22:1:24 | def@1:22 | es2015modules.js:6:3:6:5 | baz |
 | es2015modules.js:10:10:10:13 | def@10:10 | es2015modules.js:7:3:7:6 | quux |
 | es2015modules.js:15:17:15:17 | def@15:17 | es2015modules.js:12:1:12:1 | f |
 | es2015modules.js:16:25:16:25 | def@16:25 | es2015modules.js:13:1:13:1 | g |
@@ -14,17 +14,17 @@
 | fundecls.js:30:12:30:12 | def@30:12 | fundecls.js:28:3:28:3 | f |
 | fundecls.js:36:12:36:12 | def@36:12 | fundecls.js:35:3:35:3 | f |
 | fundecls.js:39:11:39:11 | def@39:11 | fundecls.js:40:7:40:7 | x |
-| fundecls.js:45:3:45:3 | phi@45:3 | fundecls.js:45:3:45:3 | f |
+| fundecls.js:45:3:45:6 | phi@45:3 | fundecls.js:45:3:45:3 | f |
 | fundecls.js:48:11:48:11 | def@48:11 | fundecls.js:50:7:50:7 | x |
 | tst.js:1:12:1:12 | def@1:12 | tst.js:3:12:3:12 | o |
 | tst.js:1:12:1:12 | def@1:12 | tst.js:5:16:5:16 | o |
-| tst.js:2:9:2:14 | def@2:9 | tst.js:8:17:8:17 | y |
-| tst.js:3:2:3:2 | phi@3:2 | tst.js:4:5:4:5 | i |
-| tst.js:5:2:5:2 | phi@5:2 | tst.js:7:6:7:6 | i |
-| tst.js:5:2:5:2 | phi@5:2 | tst.js:8:14:8:14 | z |
+| tst.js:2:9:2:9 | def@2:9 | tst.js:8:17:8:17 | y |
+| tst.js:3:2:4:6 | phi@3:2 | tst.js:4:5:4:5 | i |
+| tst.js:5:2:7:7 | phi@5:2 | tst.js:7:6:7:6 | i |
+| tst.js:5:2:7:7 | phi@5:2 | tst.js:8:14:8:14 | z |
 | tst.js:5:11:5:11 | def@5:11 | tst.js:6:7:6:7 | z |
-| tst.js:12:2:12:7 | def@12:2 | tst.js:14:9:14:9 | x |
+| tst.js:12:2:12:2 | def@12:2 | tst.js:14:9:14:9 | x |
 | tst.js:19:11:19:11 | def@19:11 | tst.js:18:9:18:9 | x |
-| tst.js:23:6:23:23 | def@23:6 | tst.js:24:2:24:2 | a |
-| tst.js:23:6:23:23 | def@23:6 | tst.js:24:6:24:6 | c |
+| tst.js:23:7:23:7 | def@23:7 | tst.js:24:2:24:2 | a |
+| tst.js:23:14:23:14 | def@23:14 | tst.js:24:6:24:6 | c |
 | tst.js:26:11:26:11 | def@26:11 | tst.js:27:2:27:2 | a |
diff --git a/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected b/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
index b216e18c71d8..c6ca30cd3292 100644
--- a/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
+++ b/javascript/ql/test/library-tests/GlobalAccessPaths/GlobalAccessPaths.expected
@@ -9,22 +9,22 @@ test_getAReferenceTo
 | other_ns.js:4:9:4:10 | NS | NS |
 | other_ns.js:4:9:4:16 | NS \|\| {} | NS |
 | other_ns.js:6:1:6:8 | Conflict | Conflict |
-| test.js:2:7:2:17 | v | foo.bar |
+| test.js:2:7:2:7 | v | foo.bar |
 | test.js:2:11:2:13 | foo | foo |
 | test.js:2:11:2:17 | foo.bar | foo.bar |
 | test.js:3:3:3:3 | v | foo.bar |
 | test.js:3:3:3:7 | v.baz | foo.bar.baz |
 | test.js:4:7:4:24 | { baz, a, b: {c} } | foo.bar |
-| test.js:4:7:4:28 | c | foo.bar.b.c |
 | test.js:4:9:4:11 | baz | foo.bar.baz |
 | test.js:4:14:4:14 | a | foo.bar.a |
 | test.js:4:17:4:22 | b: {c} | foo.bar.b |
 | test.js:4:20:4:22 | {c} | foo.bar.b |
 | test.js:4:21:4:21 | c | foo.bar.b.c |
+| test.js:4:21:4:21 | c | foo.bar.b.c |
 | test.js:4:28:4:28 | v | foo.bar |
 | test.js:5:11:5:11 | c | foo.bar.b.c |
 | test.js:5:11:5:13 | c.d | foo.bar.b.c.d |
-| test.js:7:7:7:16 | w | window |
+| test.js:7:7:7:7 | w | window |
 | test.js:7:11:7:16 | window | window |
 | test.js:8:13:8:18 | window | window |
 | test.js:8:13:8:20 | window.x | x |
@@ -35,11 +35,11 @@ test_getAReferenceTo
 | test.js:10:13:10:13 | w | window |
 | test.js:10:13:10:15 | w.x | x |
 | test.js:10:13:10:17 | w.x.y | x.y |
-| test.js:12:7:12:25 | notUnique | foo.bar |
+| test.js:12:7:12:15 | notUnique | foo.bar |
 | test.js:12:19:12:21 | foo | foo |
 | test.js:12:19:12:25 | foo.bar | foo.bar |
 | test.js:13:7:13:15 | something | something |
-| test.js:14:5:14:23 | notUnique | bar.baz |
+| test.js:14:5:14:13 | notUnique | bar.baz |
 | test.js:14:5:14:23 | notUnique = bar.baz | bar.baz |
 | test.js:14:17:14:19 | bar | bar |
 | test.js:14:17:14:23 | bar.baz | bar.baz |
@@ -56,7 +56,7 @@ test_getAReferenceTo
 | test.js:33:7:33:18 | { bar = {} } | foo |
 | test.js:33:9:33:16 | bar = {} | foo.bar |
 | test.js:33:22:33:24 | foo | foo |
-| test.js:39:3:39:20 | lazyInit | foo.bar |
+| test.js:39:3:39:10 | lazyInit | foo.bar |
 | test.js:39:3:39:20 | lazyInit = foo.bar | foo.bar |
 | test.js:39:14:39:16 | foo | foo |
 | test.js:39:14:39:20 | foo.bar | foo.bar |
@@ -77,7 +77,7 @@ test_getAReferenceTo
 | test.js:68:11:68:34 | Object. ... ar).baz | foo.bar.baz |
 | test.js:68:23:68:25 | foo | foo |
 | test.js:68:23:68:29 | foo.bar | foo.bar |
-| test.js:69:6:69:15 | O | Object |
+| test.js:69:6:69:6 | O | Object |
 | test.js:69:10:69:15 | Object | Object |
 | test.js:70:11:70:11 | O | Object |
 | test.js:70:11:70:16 | O.seal | Object.seal |
diff --git a/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected b/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
index e971020cdd61..fba49cf683bb 100644
--- a/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
+++ b/javascript/ql/test/library-tests/SSA/GetRhsNode/GetRhsNode.expected
@@ -1,14 +1,14 @@
-| tst.js:2:7:2:13 | a = g() | tst.js:2:7:2:7 | a | tst.js:2:11:2:13 | g() |
-| tst.js:4:7:4:24 | { propB: b } = g() | tst.js:4:16:4:16 | b | tst.js:4:9:4:16 | propB: b |
-| tst.js:6:7:6:34 | { propC ... } = g() | tst.js:6:16:6:16 | c | tst.js:6:9:6:16 | propC: c |
-| tst.js:6:7:6:34 | { propC ... } = g() | tst.js:6:26:6:26 | d | tst.js:6:19:6:26 | propD: d |
-| tst.js:8:7:8:41 | { array ... } = g() | tst.js:8:22:8:25 | elm1 | tst.js:8:22:8:25 | elm1 |
-| tst.js:8:7:8:41 | { array ... } = g() | tst.js:8:28:8:31 | elm2 | tst.js:8:28:8:31 | elm2 |
-| tst.js:17:3:17:22 | ({ propB: b }) = g() | tst.js:4:16:4:16 | b | tst.js:17:6:17:13 | propB: b |
-| tst.js:19:3:19:32 | ({ prop ... ) = g() | tst.js:6:16:6:16 | c | tst.js:19:6:19:13 | propC: c |
-| tst.js:19:3:19:32 | ({ prop ... ) = g() | tst.js:6:26:6:26 | d | tst.js:19:16:19:23 | propD: d |
-| tst.js:21:3:21:22 | [ elm1, elm2 ] = g() | tst.js:8:22:8:25 | elm1 | tst.js:21:5:21:8 | elm1 |
-| tst.js:21:3:21:22 | [ elm1, elm2 ] = g() | tst.js:8:28:8:31 | elm2 | tst.js:21:11:21:14 | elm2 |
-| tst.js:31:12:31:23 | [elm1, elm2] | tst.js:31:13:31:16 | elm1 | tst.js:31:13:31:16 | elm1 |
-| tst.js:31:12:31:23 | [elm1, elm2] | tst.js:31:19:31:22 | elm2 | tst.js:31:19:31:22 | elm2 |
-| tst.js:31:26:31:40 | { prop: value } | tst.js:31:34:31:38 | value | tst.js:31:28:31:38 | prop: value |
+| tst.js:2:7:2:7 | a = g() | tst.js:2:7:2:7 | a | tst.js:2:11:2:13 | g() |
+| tst.js:4:16:4:16 | { propB: b } = g() | tst.js:4:16:4:16 | b | tst.js:4:9:4:16 | propB: b |
+| tst.js:6:16:6:16 | { propC ... } = g() | tst.js:6:16:6:16 | c | tst.js:6:9:6:16 | propC: c |
+| tst.js:6:26:6:26 | { propC ... } = g() | tst.js:6:26:6:26 | d | tst.js:6:19:6:26 | propD: d |
+| tst.js:8:22:8:25 | { array ... } = g() | tst.js:8:22:8:25 | elm1 | tst.js:8:22:8:25 | elm1 |
+| tst.js:8:28:8:31 | { array ... } = g() | tst.js:8:28:8:31 | elm2 | tst.js:8:28:8:31 | elm2 |
+| tst.js:17:13:17:13 | ({ propB: b }) = g() | tst.js:4:16:4:16 | b | tst.js:17:6:17:13 | propB: b |
+| tst.js:19:13:19:13 | ({ prop ... ) = g() | tst.js:6:16:6:16 | c | tst.js:19:6:19:13 | propC: c |
+| tst.js:19:23:19:23 | ({ prop ... ) = g() | tst.js:6:26:6:26 | d | tst.js:19:16:19:23 | propD: d |
+| tst.js:21:5:21:8 | [ elm1, elm2 ] = g() | tst.js:8:22:8:25 | elm1 | tst.js:21:5:21:8 | elm1 |
+| tst.js:21:11:21:14 | [ elm1, elm2 ] = g() | tst.js:8:28:8:31 | elm2 | tst.js:21:11:21:14 | elm2 |
+| tst.js:31:13:31:16 | [elm1, elm2] | tst.js:31:13:31:16 | elm1 | tst.js:31:13:31:16 | elm1 |
+| tst.js:31:19:31:22 | [elm1, elm2] | tst.js:31:19:31:22 | elm2 | tst.js:31:19:31:22 | elm2 |
+| tst.js:31:34:31:38 | { prop: value } | tst.js:31:34:31:38 | value | tst.js:31:28:31:38 | prop: value |
diff --git a/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected b/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
index 77536822831f..9bc6c4723744 100644
--- a/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
+++ b/javascript/ql/test/library-tests/SSA/SSADefinition/SSADefinition.expected
@@ -1,39 +1,39 @@
-| tst.js:1:1:1:1 | implicit initialization of y |
+| tst.js:1:1:1:0 | implicit initialization of y |
 | tst.js:1:12:1:12 | x |
 | tst.js:3:7:3:7 | x = refine[guard: x is false](def@1:12) |
 | tst.js:3:7:3:7 | x = refine[guard: x is true](def@1:12) |
-| tst.js:4:5:4:9 | y = x |
-| tst.js:5:3:5:3 | x = phi(refine[guard: x is false]@3:7, refine[guard: x is true]@3:7) |
-| tst.js:5:3:5:3 | y = phi(def@4:5, implicitInit@1:1) |
-| tst.js:5:3:5:7 | z = y |
+| tst.js:4:5:4:5 | y = x |
+| tst.js:5:3:5:3 | z = y |
+| tst.js:5:3:5:8 | x = phi(refine[guard: x is false]@3:7, refine[guard: x is true]@3:7) |
+| tst.js:5:3:5:8 | y = phi(def@4:5, implicitInit@1:1) |
 | tst.js:6:10:6:10 | x = phi(phi@5:3, refine[guard: x is true]@6:10) |
 | tst.js:6:10:6:10 | x = refine[guard: x is true](phi@6:10) |
 | tst.js:6:10:6:10 | z = phi(def@5:3, def@7:5) |
-| tst.js:7:5:7:7 | z++ |
-| tst.js:11:1:11:1 | implicit initialization of x |
+| tst.js:7:5:7:5 | z++ |
+| tst.js:11:1:11:0 | implicit initialization of x |
 | tst.js:11:12:11:12 | x |
 | tst.js:12:3:12:2 | capture variable x |
-| tst.js:15:3:15:8 | x = 42 |
-| tst.js:18:1:18:1 | implicit initialization of x |
-| tst.js:19:7:19:11 | x = 0 |
+| tst.js:15:3:15:3 | x = 42 |
+| tst.js:18:1:18:0 | implicit initialization of x |
+| tst.js:19:7:19:7 | x = 0 |
+| tst.js:20:3:20:2 | capture variable x |
 | tst.js:20:3:20:2 | capture variable x |
 | tst.js:20:13:20:16 | iter |
-| tst.js:22:5:22:9 | capture variable x |
-| tst.js:25:7:25:18 | gen = iter() |
-| tst.js:27:3:27:5 | ++x |
-| tst.js:31:1:31:1 | implicit initialization of x |
-| tst.js:31:1:31:1 | implicit initialization of y |
+| tst.js:25:7:25:9 | gen = iter() |
+| tst.js:27:5:27:5 | ++x |
+| tst.js:31:1:31:0 | capture variable x |
+| tst.js:31:1:31:0 | implicit initialization of x |
+| tst.js:31:1:31:0 | implicit initialization of y |
 | tst.js:32:3:32:2 | capture variable x |
 | tst.js:32:3:32:2 | capture variable y |
 | tst.js:32:12:32:16 | inner |
-| tst.js:34:5:34:10 | x += y |
-| tst.js:36:7:36:11 | x = 0 |
-| tst.js:36:14:36:18 | y = 1 |
-| tst.js:37:3:37:9 | capture variable x |
-| tst.js:41:1:41:1 | implicit initialization of x |
-| tst.js:42:7:42:11 | x = 0 |
-| tst.js:42:14:42:18 | y = 1 |
-| tst.js:43:7:43:37 | inc = ( ...  */ ++x |
+| tst.js:34:5:34:5 | x += y |
+| tst.js:36:7:36:7 | x = 0 |
+| tst.js:36:14:36:14 | y = 1 |
+| tst.js:41:1:41:0 | capture variable x |
+| tst.js:41:1:41:0 | implicit initialization of x |
+| tst.js:42:7:42:7 | x = 0 |
+| tst.js:42:14:42:14 | y = 1 |
+| tst.js:43:7:43:9 | inc = ( ...  */ ++x |
 | tst.js:43:13:43:12 | capture variable x |
-| tst.js:43:35:43:37 | ++x |
-| tst.js:44:3:44:11 | capture variable x |
+| tst.js:43:37:43:37 | ++x |
diff --git a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
index fa1632d27574..c21fbad32923 100644
--- a/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
+++ b/javascript/ql/test/library-tests/StringConcatenation/StringOps.expected
@@ -6,26 +6,26 @@ concatenation
 | html-concat.js:3:14:3:26 | `<B>${x}</B>` |
 | html-concat.js:5:21:5:47 | `Hey <s ... trong>` |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
-| html-concat.js:14:3:14:13 | buffer |
+| html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x |
-| html-concat.js:15:3:15:15 | buffer |
+| html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' |
-| tst.js:3:3:3:12 | x |
+| tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" |
-| tst.js:4:3:4:14 | x |
+| tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" |
-| tst.js:5:3:5:13 | x |
+| tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" |
-| tst.js:12:5:12:26 | x |
+| tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" |
 | tst.js:12:10:12:18 | "one" + y |
 | tst.js:12:10:12:26 | "one" + y + "two" |
-| tst.js:14:3:14:13 | x |
+| tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" |
 | tst.js:19:11:19:23 | "one" + "two" |
-| tst.js:20:3:20:25 | x |
+| tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") |
 | tst.js:20:9:20:24 | "three" + "four" |
 | tst.js:21:10:21:19 | x + "five" |
@@ -43,9 +43,9 @@ concatenation
 | tst.js:61:10:61:34 | `first  ... } last` |
 | tst.js:77:15:77:37 | ["one", ... three"] |
 | tst.js:79:12:79:23 | array.join() |
-| tst.js:87:5:87:14 | x |
+| tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' |
-| tst.js:89:3:89:14 | x |
+| tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' |
 | tst.js:95:7:95:30 | x.conca ... three') |
 | tst.js:104:11:104:23 | "foo" + "bar" |
@@ -262,31 +262,31 @@ concatenationNode
 | html-concat.js:8:13:8:13 | x |
 | html-concat.js:8:15:10:23 | .\\n    \\n ... um!</i> |
 | html-concat.js:13:3:13:8 | buffer |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
 | html-concat.js:13:13:13:18 | '<li>' |
 | html-concat.js:14:3:14:8 | buffer |
-| html-concat.js:14:3:14:13 | buffer |
+| html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x |
 | html-concat.js:14:13:14:13 | x |
 | html-concat.js:15:3:15:8 | buffer |
-| html-concat.js:15:3:15:15 | buffer |
+| html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' |
 | html-concat.js:15:13:15:15 | '!' |
 | tst.js:3:3:3:3 | x |
-| tst.js:3:3:3:12 | x |
+| tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" |
 | tst.js:3:8:3:12 | "two" |
 | tst.js:4:3:4:3 | x |
-| tst.js:4:3:4:14 | x |
+| tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" |
 | tst.js:4:8:4:14 | "three" |
 | tst.js:5:3:5:3 | x |
-| tst.js:5:3:5:13 | x |
+| tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" |
 | tst.js:5:8:5:13 | "four" |
 | tst.js:12:5:12:5 | x |
-| tst.js:12:5:12:26 | x |
+| tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" |
 | tst.js:12:10:12:14 | "one" |
 | tst.js:12:10:12:18 | "one" + y |
@@ -294,14 +294,14 @@ concatenationNode
 | tst.js:12:18:12:18 | y |
 | tst.js:12:22:12:26 | "two" |
 | tst.js:14:3:14:3 | x |
-| tst.js:14:3:14:13 | x |
+| tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" |
 | tst.js:14:8:14:13 | "last" |
 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:11:19:23 | "one" + "two" |
 | tst.js:19:19:19:23 | "two" |
 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:25 | x |
+| tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") |
 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:15 | "three" |
@@ -349,11 +349,11 @@ concatenationNode
 | tst.js:77:30:77:36 | "three" |
 | tst.js:79:12:79:23 | array.join() |
 | tst.js:87:5:87:5 | x |
-| tst.js:87:5:87:14 | x |
+| tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' |
 | tst.js:87:10:87:14 | 'two' |
 | tst.js:89:3:89:3 | x |
-| tst.js:89:3:89:14 | x |
+| tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' |
 | tst.js:89:8:89:14 | 'three' |
 | tst.js:95:7:95:7 | x |
@@ -396,46 +396,46 @@ operand
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 0 | html-concat.js:7:19:8:10 | \\n    Hello  |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 1 | html-concat.js:8:13:8:13 | x |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` | 2 | html-concat.js:8:15:10:23 | .\\n    \\n ... um!</i> |
-| html-concat.js:13:3:13:18 | buffer | 0 | html-concat.js:13:3:13:8 | buffer |
-| html-concat.js:13:3:13:18 | buffer | 1 | html-concat.js:13:13:13:18 | '<li>' |
+| html-concat.js:13:3:13:8 | buffer | 0 | html-concat.js:13:3:13:8 | buffer |
+| html-concat.js:13:3:13:8 | buffer | 1 | html-concat.js:13:13:13:18 | '<li>' |
 | html-concat.js:13:3:13:18 | buffer += '<li>' | 0 | html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' | 1 | html-concat.js:13:13:13:18 | '<li>' |
-| html-concat.js:14:3:14:13 | buffer | 0 | html-concat.js:14:3:14:8 | buffer |
-| html-concat.js:14:3:14:13 | buffer | 1 | html-concat.js:14:13:14:13 | x |
+| html-concat.js:14:3:14:8 | buffer | 0 | html-concat.js:14:3:14:8 | buffer |
+| html-concat.js:14:3:14:8 | buffer | 1 | html-concat.js:14:13:14:13 | x |
 | html-concat.js:14:3:14:13 | buffer += x | 0 | html-concat.js:14:3:14:8 | buffer |
 | html-concat.js:14:3:14:13 | buffer += x | 1 | html-concat.js:14:13:14:13 | x |
-| html-concat.js:15:3:15:15 | buffer | 0 | html-concat.js:15:3:15:8 | buffer |
-| html-concat.js:15:3:15:15 | buffer | 1 | html-concat.js:15:13:15:15 | '!' |
+| html-concat.js:15:3:15:8 | buffer | 0 | html-concat.js:15:3:15:8 | buffer |
+| html-concat.js:15:3:15:8 | buffer | 1 | html-concat.js:15:13:15:15 | '!' |
 | html-concat.js:15:3:15:15 | buffer += '!' | 0 | html-concat.js:15:3:15:8 | buffer |
 | html-concat.js:15:3:15:15 | buffer += '!' | 1 | html-concat.js:15:13:15:15 | '!' |
-| tst.js:3:3:3:12 | x | 0 | tst.js:3:3:3:3 | x |
-| tst.js:3:3:3:12 | x | 1 | tst.js:3:8:3:12 | "two" |
+| tst.js:3:3:3:3 | x | 0 | tst.js:3:3:3:3 | x |
+| tst.js:3:3:3:3 | x | 1 | tst.js:3:8:3:12 | "two" |
 | tst.js:3:3:3:12 | x += "two" | 0 | tst.js:3:3:3:3 | x |
 | tst.js:3:3:3:12 | x += "two" | 1 | tst.js:3:8:3:12 | "two" |
-| tst.js:4:3:4:14 | x | 0 | tst.js:4:3:4:3 | x |
-| tst.js:4:3:4:14 | x | 1 | tst.js:4:8:4:14 | "three" |
+| tst.js:4:3:4:3 | x | 0 | tst.js:4:3:4:3 | x |
+| tst.js:4:3:4:3 | x | 1 | tst.js:4:8:4:14 | "three" |
 | tst.js:4:3:4:14 | x += "three" | 0 | tst.js:4:3:4:3 | x |
 | tst.js:4:3:4:14 | x += "three" | 1 | tst.js:4:8:4:14 | "three" |
-| tst.js:5:3:5:13 | x | 0 | tst.js:5:3:5:3 | x |
-| tst.js:5:3:5:13 | x | 1 | tst.js:5:8:5:13 | "four" |
+| tst.js:5:3:5:3 | x | 0 | tst.js:5:3:5:3 | x |
+| tst.js:5:3:5:3 | x | 1 | tst.js:5:8:5:13 | "four" |
 | tst.js:5:3:5:13 | x += "four" | 0 | tst.js:5:3:5:3 | x |
 | tst.js:5:3:5:13 | x += "four" | 1 | tst.js:5:8:5:13 | "four" |
-| tst.js:12:5:12:26 | x | 0 | tst.js:12:5:12:5 | x |
-| tst.js:12:5:12:26 | x | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
+| tst.js:12:5:12:5 | x | 0 | tst.js:12:5:12:5 | x |
+| tst.js:12:5:12:5 | x | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
 | tst.js:12:5:12:26 | x += "o ... + "two" | 0 | tst.js:12:5:12:5 | x |
 | tst.js:12:5:12:26 | x += "o ... + "two" | 1 | tst.js:12:10:12:26 | "one" + y + "two" |
 | tst.js:12:10:12:18 | "one" + y | 0 | tst.js:12:10:12:14 | "one" |
 | tst.js:12:10:12:18 | "one" + y | 1 | tst.js:12:18:12:18 | y |
 | tst.js:12:10:12:26 | "one" + y + "two" | 0 | tst.js:12:10:12:18 | "one" + y |
 | tst.js:12:10:12:26 | "one" + y + "two" | 1 | tst.js:12:22:12:26 | "two" |
-| tst.js:14:3:14:13 | x | 0 | tst.js:14:3:14:3 | x |
-| tst.js:14:3:14:13 | x | 1 | tst.js:14:8:14:13 | "last" |
+| tst.js:14:3:14:3 | x | 0 | tst.js:14:3:14:3 | x |
+| tst.js:14:3:14:3 | x | 1 | tst.js:14:8:14:13 | "last" |
 | tst.js:14:3:14:13 | x += "last" | 0 | tst.js:14:3:14:3 | x |
 | tst.js:14:3:14:13 | x += "last" | 1 | tst.js:14:8:14:13 | "last" |
 | tst.js:19:11:19:23 | "one" + "two" | 0 | tst.js:19:11:19:15 | "one" |
 | tst.js:19:11:19:23 | "one" + "two" | 1 | tst.js:19:19:19:23 | "two" |
-| tst.js:20:3:20:25 | x | 0 | tst.js:20:3:20:3 | x |
-| tst.js:20:3:20:25 | x | 1 | tst.js:20:8:20:25 | ("three" + "four") |
+| tst.js:20:3:20:3 | x | 0 | tst.js:20:3:20:3 | x |
+| tst.js:20:3:20:3 | x | 1 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:3:20:25 | x += (" ... "four") | 0 | tst.js:20:3:20:3 | x |
 | tst.js:20:3:20:25 | x += (" ... "four") | 1 | tst.js:20:8:20:25 | ("three" + "four") |
 | tst.js:20:9:20:24 | "three" + "four" | 0 | tst.js:20:9:20:15 | "three" |
@@ -472,12 +472,12 @@ operand
 | tst.js:77:15:77:37 | ["one", ... three"] | 1 | tst.js:77:23:77:27 | "two" |
 | tst.js:77:15:77:37 | ["one", ... three"] | 2 | tst.js:77:30:77:36 | "three" |
 | tst.js:79:12:79:23 | array.join() | 0 | tst.js:77:15:77:37 | ["one", ... three"] |
-| tst.js:87:5:87:14 | x | 0 | tst.js:87:5:87:5 | x |
-| tst.js:87:5:87:14 | x | 1 | tst.js:87:10:87:14 | 'two' |
+| tst.js:87:5:87:5 | x | 0 | tst.js:87:5:87:5 | x |
+| tst.js:87:5:87:5 | x | 1 | tst.js:87:10:87:14 | 'two' |
 | tst.js:87:5:87:14 | x += 'two' | 0 | tst.js:87:5:87:5 | x |
 | tst.js:87:5:87:14 | x += 'two' | 1 | tst.js:87:10:87:14 | 'two' |
-| tst.js:89:3:89:14 | x | 0 | tst.js:89:3:89:3 | x |
-| tst.js:89:3:89:14 | x | 1 | tst.js:89:8:89:14 | 'three' |
+| tst.js:89:3:89:3 | x | 0 | tst.js:89:3:89:3 | x |
+| tst.js:89:3:89:3 | x | 1 | tst.js:89:8:89:14 | 'three' |
 | tst.js:89:3:89:14 | x += 'three' | 0 | tst.js:89:3:89:3 | x |
 | tst.js:89:3:89:14 | x += 'three' | 1 | tst.js:89:8:89:14 | 'three' |
 | tst.js:95:7:95:30 | x.conca ... three') | 0 | tst.js:95:7:95:7 | x |
@@ -553,7 +553,7 @@ htmlRoot
 | html-concat.js:3:14:3:26 | `<B>${x}</B>` |
 | html-concat.js:5:21:5:47 | `Hey <s ... trong>` |
 | html-concat.js:7:18:10:24 | `\\n    H ... m!</i>` |
-| html-concat.js:13:3:13:18 | buffer |
+| html-concat.js:13:3:13:8 | buffer |
 | html-concat.js:13:3:13:18 | buffer += '<li>' |
 htmlLeaf
 | html-concat.js:2:15:2:17 | <b> |
diff --git a/javascript/ql/test/library-tests/frameworks/Electron/tests.expected b/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
index 72fb0a737b85..a51c8e632b18 100644
--- a/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/Electron/tests.expected
@@ -1,7 +1,7 @@
 browserObject
-| electron.js:3:5:3:48 | bw |
+| electron.js:3:5:3:6 | bw |
 | electron.js:3:10:3:48 | new Bro ... s: {}}) |
-| electron.js:4:5:4:46 | bv |
+| electron.js:4:5:4:6 | bv |
 | electron.js:4:10:4:46 | new Bro ... s: {}}) |
 | electron.js:35:1:37:1 | return of function foo |
 | electron.js:35:14:35:14 | x |
@@ -11,7 +11,7 @@ browserObject
 | electron.js:39:5:39:6 | bw |
 | electron.js:40:1:40:7 | foo(bv) |
 | electron.js:40:5:40:6 | bv |
-| electron.js:62:7:62:59 | win |
+| electron.js:62:7:62:9 | win |
 | electron.js:62:13:62:59 | new Bro ... 1500 }) |
 | electron.js:63:3:63:5 | win |
 | electron.js:65:18:65:20 | win |
diff --git a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
index 9b453989bb80..16d31cd07e15 100644
--- a/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/ReactJS/tests.expected
@@ -225,7 +225,7 @@ reactComponentRef
 | statePropertyReads.js:1:1:13:1 | class R ...     }\\n} | statePropertyReads.js:7:9:7:12 | this |
 | statePropertyReads.js:1:1:13:1 | class R ...     }\\n} | statePropertyReads.js:10:23:10:22 | this |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:2:16:2:15 | this |
-| statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:13:3:22 | cmp |
+| statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:13:3:15 | cmp |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:3:19:3:22 | this |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:4:9:4:11 | cmp |
 | statePropertyWrites.js:1:1:34:1 | class W ...    };\\n} | statePropertyWrites.js:6:9:6:11 | cmp |
@@ -241,7 +241,7 @@ reactComponentRef
 | statePropertyWrites.js:36:19:45:1 | {\\n  ren ... ;\\n  }\\n} | statePropertyWrites.js:40:20:40:19 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:2:17:2:16 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:3:9:3:12 | this |
-| thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:13:5:22 | dis |
+| thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:13:5:15 | dis |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:5:19:5:22 | this |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:6:9:6:11 | dis |
 | thisAccesses.js:1:1:16:1 | class C ...     }\\n} | thisAccesses.js:8:10:8:9 | this |
diff --git a/javascript/ql/test/library-tests/frameworks/koa/tests.expected b/javascript/ql/test/library-tests/frameworks/koa/tests.expected
index 365986dfa0b6..1c3a323d1105 100644
--- a/javascript/ql/test/library-tests/frameworks/koa/tests.expected
+++ b/javascript/ql/test/library-tests/frameworks/koa/tests.expected
@@ -67,7 +67,7 @@ test_HeaderAccess
 test_ResponseExpr
 | src/koa.js:12:3:12:15 | this.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:14:3:14:14 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
-| src/koa.js:15:7:15:24 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
+| src/koa.js:15:7:15:9 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:15:13:15:24 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:16:3:16:5 | rsp | src/koa.js:10:10:28:1 | functio ... az');\\n} |
 | src/koa.js:18:3:18:14 | ctx.response | src/koa.js:10:10:28:1 | functio ... az');\\n} |
@@ -190,7 +190,7 @@ test_RouteHandler_getARequestExpr
 test_RouteHandler_getAResponseExpr
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:12:3:12:15 | this.response |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:14:3:14:14 | ctx.response |
-| src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:7:15:24 | rsp |
+| src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:7:15:9 | rsp |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:15:13:15:24 | ctx.response |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:16:3:16:5 | rsp |
 | src/koa.js:10:10:28:1 | functio ... az');\\n} | src/koa.js:18:3:18:14 | ctx.response |
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 de528b8bde2e..4e58b4f85486 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
@@ -12,20 +12,20 @@
 | 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 |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | provenance |  |
-| tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:3:5:3:27 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:7:16:7:24 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:8:31:8:39 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:9:18:9:26 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:10:19:10:27 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:11:20:11:28 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:15:16:15:24 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:33:14:33:22 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:34:34:34:42 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:42:8:42:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:43:8:43:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | tst-UntrustedDataToExternalAPI.js:44:8:44:16 | untrusted | provenance |  |
+| tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | tst-UntrustedDataToExternalAPI.js:3:5:3:13 | untrusted | provenance |  |
 | 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 |  |
@@ -39,7 +39,7 @@ edges
 | 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:5:3:13 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:3:17:3:27 | window.name | semmle.label | window.name |
 | tst-UntrustedDataToExternalAPI.js:5:13:5:21 | untrusted | semmle.label | untrusted |
 | tst-UntrustedDataToExternalAPI.js:6:17:6:25 | untrusted | semmle.label | untrusted |
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 2a3e4c18884b..833128c12924 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
@@ -251,35 +251,35 @@
 | 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:9:41:9:44 | path | provenance |  |
+| TaintedPath-es6.js:7:7:7:10 | 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:14:7:44 | parse(r ... ry.path | TaintedPath-es6.js:7:7:7:10 | 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: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:7:9:10 | path | TaintedPath.js:11:29:11:32 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:13:45:13:48 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:16:33:16:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:19:33:19:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | path | TaintedPath.js:22:33:22:36 | path | provenance |  |
+| TaintedPath.js:9:7:9:10 | 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:14:9:48 | url.par ... ry.path | TaintedPath.js:9:7:9:10 | path | provenance |  |
 | TaintedPath.js:9:24:9:30 | req.url | TaintedPath.js:9:14:9:37 | url.par ... , true) | provenance | Config |
 | 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:3:36:6 | path | TaintedPath.js:39:48:39:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:42:45:42:48 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:43:51:43:54 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:44:50:44:53 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:45:52:45:55 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:46:49:46:52 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:47:48:47:51 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | path | TaintedPath.js:48:54:48:57 | path | provenance |  |
+| TaintedPath.js:36:3:36:6 | 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:10:36:44 | url.par ... ry.path | TaintedPath.js:36:3:36:6 | 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 |
@@ -296,57 +296,57 @@ edges
 | 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:6:73:9 | path | TaintedPath.js:75:44:75:47 | path | provenance |  |
+| TaintedPath.js:73:6:73:9 | 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:13:73:47 | url.par ... ry.path | TaintedPath.js:73:6:73:9 | 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:6:109:9 | 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:13:109:47 | url.par ... ry.path | TaintedPath.js:109:6:109:9 | 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:7:115:10 | path | TaintedPath.js:117:19:117:22 | path | provenance |  |
+| TaintedPath.js:115:7:115:10 | 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:14:115:48 | url.par ... ry.path | TaintedPath.js:115:7:115:10 | 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:7:119:11 | split | TaintedPath.js:121:19:121:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:125:19:125:23 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:126:28:126:32 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:128:33:128:37 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | split | TaintedPath.js:131:20:131:24 | split | provenance |  |
+| TaintedPath.js:119:7:119:11 | 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:119:15:119:29 | path.split("/") | TaintedPath.js:119:7:119:11 | 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:7:128:15 | concatted | TaintedPath.js:129:19:129:27 | concatted | provenance |  |
+| TaintedPath.js:128:19:128:38 | prefix.concat(split) | TaintedPath.js:128:7:128:15 | 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:7:131:16 | 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:131:20:131:39 | split.concat(prefix) | TaintedPath.js:131:7:131:16 | 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:7:139:10 | path | TaintedPath.js:143:29:143:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:149:29:149:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:150:29:150:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:151:29:151:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:152:29:152:32 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | path | TaintedPath.js:167:40:167:43 | path | provenance |  |
+| TaintedPath.js:139:7:139:10 | 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:14:139:48 | url.par ... ry.path | TaintedPath.js:139:7:139:10 | 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 |
@@ -364,360 +364,360 @@ edges
 | 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:7:184:10 | path | TaintedPath.js:185:31:185:34 | path | provenance |  |
+| TaintedPath.js:184:7:184:10 | path | TaintedPath.js:186:45:186:48 | path | provenance |  |
+| TaintedPath.js:184:7:184:10 | 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:14:184:48 | url.par ... ry.path | TaintedPath.js:184:7:184:10 | 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:7:191:10 | 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:14:191:48 | url.par ... ry.path | TaintedPath.js:191:7:191:10 | 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:7:200:10 | path | TaintedPath.js:202:29:202:32 | path | provenance |  |
+| TaintedPath.js:200:7:200:10 | 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:14:200:48 | url.par ... ry.path | TaintedPath.js:200:7:200:10 | 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:7:212:10 | path | TaintedPath.js:213:33:213:36 | path | provenance |  |
+| TaintedPath.js:212:7:212:10 | 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:14:212:48 | url.par ... ry.path | TaintedPath.js:212:7:212:10 | 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:9:213:22 | improperEscape | TaintedPath.js:214:29:214:42 | improperEscape | provenance |  |
+| TaintedPath.js:213:26:213:37 | escape(path) | TaintedPath.js:213:9:213:22 | 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:9:215:23 | improperEscape2 | TaintedPath.js:216:29:216:43 | improperEscape2 | provenance |  |
+| TaintedPath.js:215:27:215:40 | unescape(path) | TaintedPath.js:215:9:215:23 | 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:7:8:14 | 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:18:8:52 | url.par ... ry.path | examples/TaintedPath.js:8:7:8:14 | 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:10:36:10:43 | filePath | examples/TaintedPath.js:10:29:10:43 | ROOT + filePath | provenance | Config |
-| execa.js:6:9:6:64 | filePath | execa.js:9:26:9:33 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:12:37:12:44 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:15:50:15:57 | filePath | provenance |  |
-| execa.js:6:9:6:64 | filePath | execa.js:18:62:18:69 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:9:26:9:33 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:12:37:12:44 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:15:50:15:57 | filePath | provenance |  |
+| execa.js:6:9:6:16 | filePath | execa.js:18:62:18:69 | filePath | provenance |  |
 | execa.js:6:20:6:43 | url.par ... , true) | execa.js:6:20:6:49 | url.par ... ).query | provenance | Config |
 | execa.js:6:20:6:49 | url.par ... ).query | execa.js:6:20:6:61 | url.par ... ePath"] | provenance | Config |
 | execa.js:6:20:6:61 | url.par ... ePath"] | execa.js:6:20:6:64 | url.par ... th"][0] | provenance | Config |
-| execa.js:6:20:6:64 | url.par ... th"][0] | execa.js:6:9:6:64 | filePath | provenance |  |
+| execa.js:6:20:6:64 | url.par ... th"][0] | execa.js:6:9:6:16 | filePath | provenance |  |
 | execa.js:6:30:6:36 | req.url | execa.js:6:20:6:43 | url.par ... , true) | 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 |  |
-| make-dir.js:7:11:7:31 | file | make-dir.js:9:25:9:28 | file | provenance |  |
-| make-dir.js:7:11:7:31 | file | make-dir.js:10:23:10:26 | file | provenance |  |
-| make-dir.js:7:18:7:31 | req.query.file | make-dir.js:7:11:7:31 | file | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:11:12:11:18 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:12:17:12:23 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:13:23:13:29 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:14:19:14:25 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:15:19:15:25 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:16:23:16:29 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:17:25:17:31 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:18:25:18:31 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:19:29:19:35 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:20:29:20:35 | dirPath | provenance |  |
-| mkdirp.js:9:11:9:76 | dirPath | mkdirp.js:21:23:21:29 | dirPath | provenance |  |
-| mkdirp.js:9:21:9:76 | path.jo ... ltDir') | mkdirp.js:9:11:9:76 | dirPath | provenance |  |
+| hapi.js:14:19:14:26 | filepath | hapi.js:15:44:15:51 | filepath | provenance |  |
+| hapi.js:14:30:14:51 | request ... ilepath | hapi.js:14:19:14:26 | filepath | provenance |  |
+| make-dir.js:7:11:7:14 | file | make-dir.js:9:25:9:28 | file | provenance |  |
+| make-dir.js:7:11:7:14 | file | make-dir.js:10:23:10:26 | file | provenance |  |
+| make-dir.js:7:18:7:31 | req.query.file | make-dir.js:7:11:7:14 | file | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:11:12:11:18 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:12:17:12:23 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:13:23:13:29 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:14:19:14:25 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:15:19:15:25 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:16:23:16:29 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:17:25:17:31 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:18:25:18:31 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:19:29:19:35 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:20:29:20:35 | dirPath | provenance |  |
+| mkdirp.js:9:11:9:17 | dirPath | mkdirp.js:21:23:21:29 | dirPath | provenance |  |
+| mkdirp.js:9:21:9:76 | path.jo ... ltDir') | mkdirp.js:9:11:9:17 | dirPath | provenance |  |
 | mkdirp.js:9:42:9:59 | req.query.filename | mkdirp.js:9:42:9:75 | req.que ... ultDir' | provenance |  |
 | mkdirp.js:9:42:9:75 | req.que ... ultDir' | mkdirp.js:9:21:9:76 | path.jo ... ltDir') | provenance | Config |
 | 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:13:8:20 | filename | more-fs-extra.js:8:13:8:20 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:10:15:10:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:11:11:11:18 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:12:14:12:21 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:13:18:13:25 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:14:11:14:18 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:15:21:15:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:16:21:16:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:17:31:17:38 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:18:15:18:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:19:25:19:32 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:20:21:20:28 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:21:17:21:24 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:22:16:22:23 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:23:20:23:27 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:24:19:24:26 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:25:15:25:22 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:26:19:26:26 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:27:13:27:20 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:28:17:28:24 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:29:23:29:30 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:30:16:30:23 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:31:20:31:27 | filename | provenance |  |
+| more-fs-extra.js:8:13:8:20 | filename | more-fs-extra.js:32:23:32:30 | 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 |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:16:35:16:38 | path | provenance |  |
-| normalizedPaths.js:11:7:11:27 | path | normalizedPaths.js:17:53:17:56 | path | provenance |  |
-| normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:11:7:11:27 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:13:19:13:22 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:14:26:14:29 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:15:19:15:22 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:16:35:16:38 | path | provenance |  |
+| normalizedPaths.js:11:7:11:10 | path | normalizedPaths.js:17:53:17:56 | path | provenance |  |
+| normalizedPaths.js:11:14:11:27 | req.query.path | normalizedPaths.js:11:7:11:10 | path | provenance |  |
 | normalizedPaths.js:14:26:14:29 | path | normalizedPaths.js:14:19:14:29 | './' + path | provenance | Config |
 | normalizedPaths.js:15:19:15:22 | path | normalizedPaths.js:15:19:15:38 | path + '/index.html' | provenance | Config |
 | normalizedPaths.js:16:35:16:38 | path | normalizedPaths.js:16:19:16:53 | pathMod ... .html') | provenance | Config |
 | normalizedPaths.js:17:53:17:56 | path | normalizedPaths.js:17:19:17:57 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:23:19:23:22 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:24:26:24:29 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:25:19:25:22 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:26:35:26:38 | path | provenance |  |
-| normalizedPaths.js:21:7:21:49 | path | normalizedPaths.js:27:53:27:56 | path | provenance |  |
-| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | normalizedPaths.js:21:7:21:49 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:23:19:23:22 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:24:26:24:29 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:25:19:25:22 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:26:35:26:38 | path | provenance |  |
+| normalizedPaths.js:21:7:21:10 | path | normalizedPaths.js:27:53:27:56 | path | provenance |  |
+| normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | normalizedPaths.js:21:7:21:10 | path | provenance |  |
 | normalizedPaths.js:21:35:21:48 | req.query.path | normalizedPaths.js:21:14:21:49 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:24:26:24:29 | path | normalizedPaths.js:24:19:24:29 | './' + path | provenance | Config |
 | normalizedPaths.js:25:19:25:22 | path | normalizedPaths.js:25:19:25:38 | path + '/index.html' | provenance | Config |
 | normalizedPaths.js:26:35:26:38 | path | normalizedPaths.js:26:19:26:53 | pathMod ... .html') | provenance | Config |
 | normalizedPaths.js:27:53:27:56 | path | normalizedPaths.js:27:19:27:57 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:31:7:31:49 | path | normalizedPaths.js:36:19:36:22 | path | provenance |  |
-| normalizedPaths.js:31:7:31:49 | path | normalizedPaths.js:41:21:41:24 | path | provenance |  |
-| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | normalizedPaths.js:31:7:31:49 | path | provenance |  |
+| normalizedPaths.js:31:7:31:10 | path | normalizedPaths.js:36:19:36:22 | path | provenance |  |
+| normalizedPaths.js:31:7:31:10 | path | normalizedPaths.js:41:21:41:24 | path | provenance |  |
+| normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | normalizedPaths.js:31:7:31:10 | path | provenance |  |
 | normalizedPaths.js:31:35:31:48 | req.query.path | normalizedPaths.js:31:14:31:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:59:19:59:22 | path | provenance |  |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:63:19:63:22 | path | provenance |  |
-| normalizedPaths.js:54:7:54:49 | path | normalizedPaths.js:68:21:68:24 | path | provenance |  |
-| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | normalizedPaths.js:54:7:54:49 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:59:19:59:22 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:63:19:63:22 | path | provenance |  |
+| normalizedPaths.js:54:7:54:10 | path | normalizedPaths.js:68:21:68:24 | path | provenance |  |
+| normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | normalizedPaths.js:54:7:54:10 | path | provenance |  |
 | normalizedPaths.js:54:35:54:48 | req.query.path | normalizedPaths.js:54:14:54:49 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:63:19:63:22 | path | normalizedPaths.js:63:19:63:38 | path + "/index.html" | provenance | Config |
-| normalizedPaths.js:73:7:73:56 | path | normalizedPaths.js:78:22:78:25 | path | provenance |  |
-| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | normalizedPaths.js:73:7:73:56 | path | provenance |  |
+| normalizedPaths.js:73:7:73:10 | path | normalizedPaths.js:78:22:78:25 | path | provenance |  |
+| normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | normalizedPaths.js:73:7:73:10 | path | provenance |  |
 | normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | normalizedPaths.js:73:14:73:56 | pathMod ... y.path) | provenance | Config |
 | normalizedPaths.js:73:42:73:55 | req.query.path | normalizedPaths.js:73:35:73:55 | './' +  ... ry.path | provenance | Config |
-| normalizedPaths.js:82:7:82:27 | path | normalizedPaths.js:87:29:87:32 | path | provenance |  |
-| normalizedPaths.js:82:7:82:27 | path | normalizedPaths.js:90:31:90:34 | path | provenance |  |
-| normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:82:7:82:27 | path | provenance |  |
-| normalizedPaths.js:94:7:94:49 | path | normalizedPaths.js:99:29:99:32 | path | provenance |  |
-| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | normalizedPaths.js:94:7:94:49 | path | provenance |  |
+| normalizedPaths.js:82:7:82:10 | path | normalizedPaths.js:87:29:87:32 | path | provenance |  |
+| normalizedPaths.js:82:7:82:10 | path | normalizedPaths.js:90:31:90:34 | path | provenance |  |
+| normalizedPaths.js:82:14:82:27 | req.query.path | normalizedPaths.js:82:7:82:10 | path | provenance |  |
+| normalizedPaths.js:94:7:94:10 | path | normalizedPaths.js:99:29:99:32 | path | provenance |  |
+| normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | normalizedPaths.js:94:7:94:10 | path | provenance |  |
 | normalizedPaths.js:94:35:94:48 | req.query.path | normalizedPaths.js:94:14:94:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:117:7:117:44 | path | normalizedPaths.js:119:19:119:22 | path | provenance |  |
-| normalizedPaths.js:117:7:117:44 | path | normalizedPaths.js:120:35:120:38 | path | provenance |  |
-| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | normalizedPaths.js:117:7:117:44 | path | provenance |  |
+| normalizedPaths.js:117:7:117:10 | path | normalizedPaths.js:119:19:119:22 | path | provenance |  |
+| normalizedPaths.js:117:7:117:10 | path | normalizedPaths.js:120:35:120:38 | path | provenance |  |
+| normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | normalizedPaths.js:117:7:117:10 | path | provenance |  |
 | normalizedPaths.js:117:30:117:43 | req.query.path | normalizedPaths.js:117:14:117:44 | fs.real ... y.path) | provenance | Config |
 | normalizedPaths.js:120:35:120:38 | path | normalizedPaths.js:120:19:120:53 | pathMod ... .html') | provenance | Config |
-| normalizedPaths.js:130:7:130:49 | path | normalizedPaths.js:135:21:135:24 | path | provenance |  |
-| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | normalizedPaths.js:130:7:130:49 | path | provenance |  |
+| normalizedPaths.js:130:7:130:10 | path | normalizedPaths.js:135:21:135:24 | path | provenance |  |
+| normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | normalizedPaths.js:130:7:130:10 | path | provenance |  |
 | normalizedPaths.js:130:35:130:48 | req.query.path | normalizedPaths.js:130:14:130:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:139:7:139:62 | path | normalizedPaths.js:144:21:144:24 | path | provenance |  |
-| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | normalizedPaths.js:139:7:139:62 | path | provenance |  |
+| normalizedPaths.js:139:7:139:10 | path | normalizedPaths.js:144:21:144:24 | path | provenance |  |
+| normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | normalizedPaths.js:139:7:139:10 | path | provenance |  |
 | normalizedPaths.js:139:48:139:61 | req.query.path | normalizedPaths.js:139:14:139:62 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:148:7:148:58 | path | normalizedPaths.js:151:21:151:24 | path | provenance |  |
-| normalizedPaths.js:148:7:148:58 | path | normalizedPaths.js:153:21:153:24 | path | provenance |  |
-| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | normalizedPaths.js:148:7:148:58 | path | provenance |  |
+| normalizedPaths.js:148:7:148:10 | path | normalizedPaths.js:151:21:151:24 | path | provenance |  |
+| normalizedPaths.js:148:7:148:10 | path | normalizedPaths.js:153:21:153:24 | path | provenance |  |
+| normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | normalizedPaths.js:148:7:148:10 | path | provenance |  |
 | normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | normalizedPaths.js:148:14:148:58 | 'foo/'  ... y.path) | provenance | Config |
 | normalizedPaths.js:148:44:148:57 | req.query.path | normalizedPaths.js:148:23:148:58 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:160:7:160:49 | path | normalizedPaths.js:165:19:165:22 | path | provenance |  |
-| normalizedPaths.js:160:7:160:49 | path | normalizedPaths.js:170:21:170:24 | path | provenance |  |
-| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | normalizedPaths.js:160:7:160:49 | path | provenance |  |
+| normalizedPaths.js:160:7:160:10 | path | normalizedPaths.js:165:19:165:22 | path | provenance |  |
+| normalizedPaths.js:160:7:160:10 | path | normalizedPaths.js:170:21:170:24 | path | provenance |  |
+| normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | normalizedPaths.js:160:7:160:10 | path | provenance |  |
 | normalizedPaths.js:160:35:160:48 | req.query.path | normalizedPaths.js:160:14:160:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:184:19:184:22 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:187:21:187:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:189:21:189:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:192:21:192:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:194:21:194:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:199:21:199:24 | path | provenance |  |
-| normalizedPaths.js:174:7:174:27 | path | normalizedPaths.js:201:45:201:48 | path | provenance |  |
-| normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:174:7:174:27 | path | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:205:21:205:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:208:21:208:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:7:201:49 | normalizedPath | normalizedPaths.js:210:21:210:34 | normalizedPath | provenance |  |
-| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | normalizedPaths.js:201:7:201:49 | normalizedPath | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:184:19:184:22 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:187:21:187:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:189:21:189:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:192:21:192:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:194:21:194:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:199:21:199:24 | path | provenance |  |
+| normalizedPaths.js:174:7:174:10 | path | normalizedPaths.js:201:45:201:48 | path | provenance |  |
+| normalizedPaths.js:174:14:174:27 | req.query.path | normalizedPaths.js:174:7:174:10 | path | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:205:21:205:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:208:21:208:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:7:201:20 | normalizedPath | normalizedPaths.js:210:21:210:34 | normalizedPath | provenance |  |
+| normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | normalizedPaths.js:201:7:201:20 | normalizedPath | provenance |  |
 | normalizedPaths.js:201:45:201:48 | path | normalizedPaths.js:201:24:201:49 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:214:7:214:49 | path | normalizedPaths.js:219:29:219:32 | path | provenance |  |
-| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | normalizedPaths.js:214:7:214:49 | path | provenance |  |
+| normalizedPaths.js:214:7:214:10 | path | normalizedPaths.js:219:29:219:32 | path | provenance |  |
+| normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | normalizedPaths.js:214:7:214:10 | path | provenance |  |
 | normalizedPaths.js:214:35:214:48 | req.query.path | normalizedPaths.js:214:14:214:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:219:3:219:33 | path | normalizedPaths.js:222:21:222:24 | path | provenance |  |
-| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | normalizedPaths.js:219:3:219:33 | path | provenance |  |
+| normalizedPaths.js:219:3:219:6 | path | normalizedPaths.js:222:21:222:24 | path | provenance |  |
+| normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | normalizedPaths.js:219:3:219:6 | path | provenance |  |
 | normalizedPaths.js:219:29:219:32 | path | normalizedPaths.js:219:10:219:33 | decodeU ... t(path) | provenance | Config |
-| normalizedPaths.js:226:7:226:70 | path | normalizedPaths.js:228:21:228:24 | path | provenance |  |
+| normalizedPaths.js:226:7:226:10 | path | normalizedPaths.js:228:21:228:24 | path | provenance |  |
 | normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | provenance | Config |
-| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | normalizedPaths.js:226:7:226:70 | path | provenance |  |
+| normalizedPaths.js:226:14:226:70 | pathMod ... g, ' ') | normalizedPaths.js:226:7:226:10 | path | provenance |  |
 | normalizedPaths.js:226:35:226:48 | req.query.path | normalizedPaths.js:226:14:226:49 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:238:19:238:22 | path | provenance |  |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:245:21:245:24 | path | provenance |  |
-| normalizedPaths.js:236:7:236:47 | path | normalizedPaths.js:250:21:250:24 | path | provenance |  |
-| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | normalizedPaths.js:236:7:236:47 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:238:19:238:22 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:245:21:245:24 | path | provenance |  |
+| normalizedPaths.js:236:7:236:10 | path | normalizedPaths.js:250:21:250:24 | path | provenance |  |
+| normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | normalizedPaths.js:236:7:236:10 | path | provenance |  |
 | normalizedPaths.js:236:33:236:46 | req.query.path | normalizedPaths.js:236:14:236:47 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:256:19:256:22 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:262:21:262:24 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:267:38:267:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:275:38:275:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:283:38:283:41 | path | provenance |  |
-| normalizedPaths.js:254:7:254:47 | path | normalizedPaths.js:291:38:291:41 | path | provenance |  |
-| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | normalizedPaths.js:254:7:254:47 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:256:19:256:22 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:262:21:262:24 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:267:38:267:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:275:38:275:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:283:38:283:41 | path | provenance |  |
+| normalizedPaths.js:254:7:254:10 | path | normalizedPaths.js:291:38:291:41 | path | provenance |  |
+| normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | normalizedPaths.js:254:7:254:10 | path | provenance |  |
 | normalizedPaths.js:254:33:254:46 | req.query.path | normalizedPaths.js:254:14:254:47 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:267:7:267:42 | newpath | normalizedPaths.js:270:21:270:27 | newpath | provenance |  |
-| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | normalizedPaths.js:267:7:267:42 | newpath | provenance |  |
+| normalizedPaths.js:267:7:267:13 | newpath | normalizedPaths.js:270:21:270:27 | newpath | provenance |  |
+| normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | normalizedPaths.js:267:7:267:13 | newpath | provenance |  |
 | normalizedPaths.js:267:38:267:41 | path | normalizedPaths.js:267:17:267:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:275:7:275:42 | newpath | normalizedPaths.js:278:21:278:27 | newpath | provenance |  |
-| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | normalizedPaths.js:275:7:275:42 | newpath | provenance |  |
+| normalizedPaths.js:275:7:275:13 | newpath | normalizedPaths.js:278:21:278:27 | newpath | provenance |  |
+| normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | normalizedPaths.js:275:7:275:13 | newpath | provenance |  |
 | normalizedPaths.js:275:38:275:41 | path | normalizedPaths.js:275:17:275:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:283:7:283:42 | newpath | normalizedPaths.js:286:21:286:27 | newpath | provenance |  |
-| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | normalizedPaths.js:283:7:283:42 | newpath | provenance |  |
+| normalizedPaths.js:283:7:283:13 | newpath | normalizedPaths.js:286:21:286:27 | newpath | provenance |  |
+| normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | normalizedPaths.js:283:7:283:13 | newpath | provenance |  |
 | normalizedPaths.js:283:38:283:41 | path | normalizedPaths.js:283:17:283:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:291:7:291:42 | newpath | normalizedPaths.js:296:21:296:27 | newpath | provenance |  |
-| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | normalizedPaths.js:291:7:291:42 | newpath | provenance |  |
+| normalizedPaths.js:291:7:291:13 | newpath | normalizedPaths.js:296:21:296:27 | newpath | provenance |  |
+| normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | normalizedPaths.js:291:7:291:13 | newpath | provenance |  |
 | normalizedPaths.js:291:38:291:41 | path | normalizedPaths.js:291:17:291:42 | pathMod ... e(path) | provenance | Config |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:304:18:304:21 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:309:19:309:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:313:19:313:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:316:19:316:22 | path | provenance |  |
-| normalizedPaths.js:303:6:303:26 | path | normalizedPaths.js:320:45:320:48 | path | provenance |  |
-| normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:303:6:303:26 | path | provenance |  |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | normalizedPaths.js:325:19:325:32 | normalizedPath | provenance |  |
-| normalizedPaths.js:320:6:320:49 | normalizedPath | normalizedPaths.js:332:19:332:32 | normalizedPath | provenance |  |
-| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | normalizedPaths.js:320:6:320:49 | normalizedPath | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:304:18:304:21 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:309:19:309:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:313:19:313:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:316:19:316:22 | path | provenance |  |
+| normalizedPaths.js:303:6:303:9 | path | normalizedPaths.js:320:45:320:48 | path | provenance |  |
+| normalizedPaths.js:303:13:303:26 | req.query.path | normalizedPaths.js:303:6:303:9 | path | provenance |  |
+| normalizedPaths.js:320:6:320:19 | normalizedPath | normalizedPaths.js:325:19:325:32 | normalizedPath | provenance |  |
+| normalizedPaths.js:320:6:320:19 | normalizedPath | normalizedPaths.js:332:19:332:32 | normalizedPath | provenance |  |
+| normalizedPaths.js:320:23:320:49 | pathMod ... , path) | normalizedPaths.js:320:6:320:19 | normalizedPath | provenance |  |
 | normalizedPaths.js:320:45:320:48 | path | normalizedPaths.js:320:23:320:49 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:339:6:339:46 | path | normalizedPaths.js:341:18:341:21 | path | provenance |  |
-| normalizedPaths.js:339:6:339:46 | path | normalizedPaths.js:346:19:346:22 | path | provenance |  |
-| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | normalizedPaths.js:339:6:339:46 | path | provenance |  |
+| normalizedPaths.js:339:6:339:9 | path | normalizedPaths.js:341:18:341:21 | path | provenance |  |
+| normalizedPaths.js:339:6:339:9 | path | normalizedPaths.js:346:19:346:22 | path | provenance |  |
+| normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | normalizedPaths.js:339:6:339:9 | path | provenance |  |
 | normalizedPaths.js:339:32:339:45 | req.query.path | normalizedPaths.js:339:13:339:46 | pathMod ... y.path) | provenance | Config |
-| normalizedPaths.js:354:7:354:27 | path | normalizedPaths.js:356:19:356:22 | path | provenance |  |
-| normalizedPaths.js:354:7:354:27 | path | normalizedPaths.js:358:47:358:50 | path | provenance |  |
-| normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:354:7:354:27 | path | provenance |  |
-| normalizedPaths.js:358:7:358:51 | requestPath | normalizedPaths.js:363:21:363:31 | requestPath | provenance |  |
-| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | normalizedPaths.js:358:7:358:51 | requestPath | provenance |  |
+| normalizedPaths.js:354:7:354:10 | path | normalizedPaths.js:356:19:356:22 | path | provenance |  |
+| normalizedPaths.js:354:7:354:10 | path | normalizedPaths.js:358:47:358:50 | path | provenance |  |
+| normalizedPaths.js:354:14:354:27 | req.query.path | normalizedPaths.js:354:7:354:10 | path | provenance |  |
+| normalizedPaths.js:358:7:358:17 | requestPath | normalizedPaths.js:363:21:363:31 | requestPath | provenance |  |
+| normalizedPaths.js:358:21:358:51 | pathMod ... , path) | normalizedPaths.js:358:7:358:17 | requestPath | provenance |  |
 | normalizedPaths.js:358:47:358:50 | path | normalizedPaths.js:358:21:358:51 | pathMod ... , path) | provenance | Config |
-| normalizedPaths.js:377:7:377:27 | path | normalizedPaths.js:379:19:379:22 | path | provenance |  |
-| normalizedPaths.js:377:7:377:27 | path | normalizedPaths.js:381:25:381:28 | path | provenance |  |
-| normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:377:7:377:27 | path | provenance |  |
+| normalizedPaths.js:377:7:377:10 | path | normalizedPaths.js:379:19:379:22 | path | provenance |  |
+| normalizedPaths.js:377:7:377:10 | path | normalizedPaths.js:381:25:381:28 | path | provenance |  |
+| normalizedPaths.js:377:14:377:27 | req.query.path | normalizedPaths.js:377:7:377:10 | path | provenance |  |
 | normalizedPaths.js:381:25:381:28 | path | normalizedPaths.js:381:19:381:29 | slash(path) | provenance | Config |
-| normalizedPaths.js:385:7:385:46 | path | normalizedPaths.js:388:19:388:22 | path | provenance |  |
-| normalizedPaths.js:385:7:385:46 | path | normalizedPaths.js:399:21:399:24 | path | provenance |  |
-| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | normalizedPaths.js:385:7:385:46 | path | provenance |  |
+| normalizedPaths.js:385:7:385:10 | path | normalizedPaths.js:388:19:388:22 | path | provenance |  |
+| normalizedPaths.js:385:7:385:10 | path | normalizedPaths.js:399:21:399:24 | path | provenance |  |
+| normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | normalizedPaths.js:385:7:385:10 | path | provenance |  |
 | normalizedPaths.js:385:35:385:45 | req.query.x | normalizedPaths.js:385:14:385:46 | pathMod ... uery.x) | provenance | Config |
 | normalizedPaths.js:407:45:407:55 | req.query.x | normalizedPaths.js:407:45:407:66 | req.que ... it('/') | provenance | Config |
 | normalizedPaths.js:407:45:407:66 | req.que ... it('/') | normalizedPaths.js:407:19:407:67 | pathMod ... t('/')) | provenance | Config |
 | normalizedPaths.js:408:38:408:48 | req.query.x | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | provenance | Config |
 | normalizedPaths.js:408:38:408:59 | req.que ... it('/') | normalizedPaths.js:408:19:408:60 | pathMod ... t('/')) | provenance | Config |
-| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:415:19:415:22 | path | provenance |  |
-| normalizedPaths.js:412:7:412:46 | path | normalizedPaths.js:426:21:426:24 | path | provenance |  |
-| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:46 | path | provenance |  |
+| normalizedPaths.js:412:7:412:10 | path | normalizedPaths.js:415:19:415:22 | path | provenance |  |
+| normalizedPaths.js:412:7:412:10 | path | normalizedPaths.js:426:21:426:24 | path | provenance |  |
+| normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | normalizedPaths.js:412:7:412:10 | path | provenance |  |
 | normalizedPaths.js:412:35:412:45 | req.query.x | normalizedPaths.js:412:14:412:46 | pathMod ... uery.x) | provenance | Config |
-| open.js:7:11:7:31 | file | open.js:9:10:9:13 | file | provenance |  |
-| open.js:7:11:7:31 | file | open.js:10:13:10:16 | file | provenance |  |
-| open.js:7:18:7:31 | req.query.file | open.js:7:11:7:31 | file | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:11:19:11:22 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:12:27:12:30 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:13:24:13:27 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:14:27:14:30 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:16:34:16:37 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:17:35:17:38 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:19:56:19:59 | path | provenance |  |
-| other-fs-libraries.js:9:7:9:48 | path | other-fs-libraries.js:24:35:24:38 | path | provenance |  |
+| open.js:7:11:7:14 | file | open.js:9:10:9:13 | file | provenance |  |
+| open.js:7:11:7:14 | file | open.js:10:13:10:16 | file | provenance |  |
+| open.js:7:18:7:31 | req.query.file | open.js:7:11:7:14 | file | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:11:19:11:22 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:12:27:12:30 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:13:24:13:27 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:14:27:14:30 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:16:34:16:37 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:17:35:17:38 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:19:56:19:59 | path | provenance |  |
+| other-fs-libraries.js:9:7:9:10 | path | other-fs-libraries.js:24:35:24:38 | path | provenance |  |
 | other-fs-libraries.js:9:14:9:37 | url.par ... , true) | other-fs-libraries.js:9:14:9:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:9:14:9:43 | url.par ... ).query | other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | other-fs-libraries.js:9:7:9:48 | path | provenance |  |
+| other-fs-libraries.js:9:14:9:48 | url.par ... ry.path | other-fs-libraries.js:9:7:9:10 | path | provenance |  |
 | other-fs-libraries.js:9:24:9:30 | req.url | other-fs-libraries.js:9:14:9:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:40:35:40:38 | path | provenance |  |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:41:50:41:53 | path | provenance |  |
-| other-fs-libraries.js:38:7:38:48 | path | other-fs-libraries.js:42:53:42:56 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:40:35:40:38 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:41:50:41:53 | path | provenance |  |
+| other-fs-libraries.js:38:7:38:10 | path | other-fs-libraries.js:42:53:42:56 | path | provenance |  |
 | other-fs-libraries.js:38:14:38:37 | url.par ... , true) | other-fs-libraries.js:38:14:38:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:38:14:38:43 | url.par ... ).query | other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | other-fs-libraries.js:38:7:38:48 | path | provenance |  |
+| other-fs-libraries.js:38:14:38:48 | url.par ... ry.path | other-fs-libraries.js:38:7:38:10 | path | provenance |  |
 | other-fs-libraries.js:38:24:38:30 | req.url | other-fs-libraries.js:38:14:38:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:51:19:51:22 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:52:24:52:27 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:54:36:54:39 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:55:36:55:39 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:57:46:57:49 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:59:39:59:42 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:62:43:62:46 | path | provenance |  |
-| other-fs-libraries.js:49:7:49:48 | path | other-fs-libraries.js:63:51:63:54 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:51:19:51:22 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:52:24:52:27 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:54:36:54:39 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:55:36:55:39 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:57:46:57:49 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:59:39:59:42 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:62:43:62:46 | path | provenance |  |
+| other-fs-libraries.js:49:7:49:10 | path | other-fs-libraries.js:63:51:63:54 | path | provenance |  |
 | other-fs-libraries.js:49:14:49:37 | url.par ... , true) | other-fs-libraries.js:49:14:49:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:49:14:49:43 | url.par ... ).query | other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | other-fs-libraries.js:49:7:49:48 | path | provenance |  |
+| other-fs-libraries.js:49:14:49:48 | url.par ... ry.path | other-fs-libraries.js:49:7:49:10 | path | provenance |  |
 | other-fs-libraries.js:49:24:49:30 | req.url | other-fs-libraries.js:49:14:49:37 | url.par ... , true) | provenance | Config |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:70:19:70:22 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:71:10:71:13 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:72:15:72:18 | path | provenance |  |
-| other-fs-libraries.js:68:7:68:48 | path | other-fs-libraries.js:73:8:73:11 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:70:19:70:22 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:71:10:71:13 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:72:15:72:18 | path | provenance |  |
+| other-fs-libraries.js:68:7:68:10 | path | other-fs-libraries.js:73:8:73:11 | path | provenance |  |
 | other-fs-libraries.js:68:14:68:37 | url.par ... , true) | other-fs-libraries.js:68:14:68:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:68:14:68:43 | url.par ... ).query | other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | other-fs-libraries.js:68:7:68:48 | path | provenance |  |
+| other-fs-libraries.js:68:14:68:48 | url.par ... ry.path | other-fs-libraries.js:68:7:68:10 | path | provenance |  |
 | other-fs-libraries.js:68:24:68:30 | req.url | other-fs-libraries.js:68:14:68:37 | url.par ... , true) | provenance | Config |
 | other-fs-libraries.js:73:8:73:11 | path | other-fs-libraries.js:75:15:75:15 | x | provenance |  |
 | other-fs-libraries.js:75:15:75:15 | x | other-fs-libraries.js:76:19:76:19 | x | provenance |  |
-| other-fs-libraries.js:81:7:81:48 | path | other-fs-libraries.js:83:16:83:19 | path | provenance |  |
+| other-fs-libraries.js:81:7:81:10 | path | other-fs-libraries.js:83:16:83:19 | path | provenance |  |
 | other-fs-libraries.js:81:14:81:37 | url.par ... , true) | other-fs-libraries.js:81:14:81:43 | url.par ... ).query | provenance | Config |
 | other-fs-libraries.js:81:14:81:43 | url.par ... ).query | other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | provenance | Config |
-| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | other-fs-libraries.js:81:7:81:48 | path | provenance |  |
+| other-fs-libraries.js:81:14:81:48 | url.par ... ry.path | other-fs-libraries.js:81:7:81:10 | path | provenance |  |
 | other-fs-libraries.js:81:24:81:30 | req.url | other-fs-libraries.js:81:14:81:37 | url.par ... , true) | provenance | Config |
-| prettier.js:6:11:6:28 | p | prettier.js:7:28:7:28 | p | provenance |  |
-| prettier.js:6:11:6:28 | p | prettier.js:11:44:11:44 | p | provenance |  |
-| prettier.js:6:13:6:13 | p | prettier.js:6:11:6:28 | p | provenance |  |
-| pupeteer.js:5:9:5:71 | tainted | pupeteer.js:9:28:9:34 | tainted | provenance |  |
-| pupeteer.js:5:9:5:71 | tainted | pupeteer.js:13:37:13:43 | tainted | provenance |  |
-| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | pupeteer.js:5:9:5:71 | tainted | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:6:13:6:13 | p | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:7:28:7:28 | p | provenance |  |
+| prettier.js:6:13:6:13 | p | prettier.js:11:44:11:44 | p | provenance |  |
+| pupeteer.js:5:9:5:15 | tainted | pupeteer.js:9:28:9:34 | tainted | provenance |  |
+| pupeteer.js:5:9:5:15 | tainted | pupeteer.js:13:37:13:43 | tainted | provenance |  |
+| pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | pupeteer.js:5:9:5:15 | tainted | provenance |  |
 | pupeteer.js:5:28:5:53 | parseTo ... t).name | pupeteer.js:5:19:5:71 | "dir/"  ... t.data" | provenance | Config |
 | rimraf.js:8:11:8:18 | { path } | rimraf.js:8:13:8:16 | path | provenance | Config |
-| rimraf.js:8:11:8:29 | path | rimraf.js:10:17:10:20 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:11:23:11:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:12:19:12:22 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:13:25:13:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:14:24:14:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:15:23:15:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:16:25:16:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:17:19:17:22 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:18:24:18:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:19:23:19:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:20:26:20:29 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:21:20:21:23 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:22:25:22:28 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:23:24:23:27 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:24:23:24:26 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:25:28:25:31 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:26:27:26:30 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:27:22:27:25 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:28:18:28:21 | path | provenance |  |
-| rimraf.js:8:11:8:29 | path | rimraf.js:29:23:29:26 | path | provenance |  |
-| rimraf.js:8:13:8:16 | path | rimraf.js:8:11:8:29 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:8:13:8:16 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:10:17:10:20 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:11:23:11:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:12:19:12:22 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:13:25:13:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:14:24:14:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:15:23:15:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:16:25:16:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:17:19:17:22 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:18:24:18:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:19:23:19:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:20:26:20:29 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:21:20:21:23 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:22:25:22:28 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:23:24:23:27 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:24:23:24:26 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:25:28:25:31 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:26:27:26:30 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:27:22:27:25 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:28:18:28:21 | path | provenance |  |
+| rimraf.js:8:13:8:16 | path | rimraf.js:29:23:29:26 | path | provenance |  |
 | rimraf.js:8:22:8:29 | req.body | rimraf.js:8:11:8:18 | { path } | provenance |  |
 | sharedlib-repro.js:13:22:13:43 | req.par ... spaceId | sharedlib-repro.js:21:27:21:34 | filepath | provenance |  |
 | sharedlib-repro.js:21:27:21:34 | filepath | sharedlib-repro.js:22:18:22:25 | filepath | provenance |  |
-| tainted-access-paths.js:6:7:6:48 | path | tainted-access-paths.js:8:19:8:22 | path | provenance |  |
-| tainted-access-paths.js:6:7:6:48 | path | tainted-access-paths.js:10:33:10:36 | path | provenance |  |
+| tainted-access-paths.js:6:7:6:10 | path | tainted-access-paths.js:8:19:8:22 | path | provenance |  |
+| tainted-access-paths.js:6:7:6:10 | path | tainted-access-paths.js:10:33:10:36 | path | provenance |  |
 | tainted-access-paths.js:6:14:6:37 | url.par ... , true) | tainted-access-paths.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:6:14:6:43 | url.par ... ).query | tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | tainted-access-paths.js:6:7:6:48 | path | provenance |  |
+| tainted-access-paths.js:6:14:6:48 | url.par ... ry.path | tainted-access-paths.js:6:7:6:10 | path | provenance |  |
 | tainted-access-paths.js:6:24:6:30 | req.url | tainted-access-paths.js:6:14:6:37 | url.par ... , true) | provenance | Config |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:12:19:12:21 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:26:19:26:21 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:29:21:29:23 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:30:23:30:25 | obj | provenance |  |
-| tainted-access-paths.js:10:7:10:36 | obj | tainted-access-paths.js:31:23:31:25 | obj | provenance |  |
-| tainted-access-paths.js:10:33:10:36 | path | tainted-access-paths.js:10:7:10:36 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:12:19:12:21 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:26:19:26:21 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:29:21:29:23 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:30:23:30:25 | obj | provenance |  |
+| tainted-access-paths.js:10:7:10:9 | obj | tainted-access-paths.js:31:23:31:25 | obj | provenance |  |
+| tainted-access-paths.js:10:33:10:36 | path | tainted-access-paths.js:10:7:10:9 | obj | provenance |  |
 | tainted-access-paths.js:12:19:12:21 | obj | tainted-access-paths.js:12:19:12:25 | obj.sub | provenance | Config |
 | tainted-access-paths.js:26:19:26:21 | obj | tainted-access-paths.js:26:19:26:26 | obj.sub3 | provenance | Config |
 | tainted-access-paths.js:29:21:29:23 | obj | tainted-access-paths.js:29:21:29:28 | obj.sub4 | provenance | Config |
 | tainted-access-paths.js:30:23:30:25 | obj | tainted-access-paths.js:30:23:30:30 | obj.sub4 | provenance | Config |
 | tainted-access-paths.js:31:23:31:25 | obj | tainted-access-paths.js:31:23:31:30 | obj.sub4 | provenance | Config |
-| tainted-access-paths.js:39:7:39:48 | path | tainted-access-paths.js:40:23:40:26 | path | provenance |  |
+| tainted-access-paths.js:39:7:39:10 | path | tainted-access-paths.js:40:23:40:26 | path | provenance |  |
 | tainted-access-paths.js:39:14:39:37 | url.par ... , true) | tainted-access-paths.js:39:14:39:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:39:14:39:43 | url.par ... ).query | tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | tainted-access-paths.js:39:7:39:48 | path | provenance |  |
+| tainted-access-paths.js:39:14:39:48 | url.par ... ry.path | tainted-access-paths.js:39:7:39:10 | path | provenance |  |
 | tainted-access-paths.js:39:24:39:30 | req.url | tainted-access-paths.js:39:14:39:37 | url.par ... , true) | provenance | Config |
-| tainted-access-paths.js:48:7:48:48 | path | tainted-access-paths.js:49:10:49:13 | path | provenance |  |
+| tainted-access-paths.js:48:7:48:10 | path | tainted-access-paths.js:49:10:49:13 | path | provenance |  |
 | tainted-access-paths.js:48:14:48:37 | url.par ... , true) | tainted-access-paths.js:48:14:48:43 | url.par ... ).query | provenance | Config |
 | tainted-access-paths.js:48:14:48:43 | url.par ... ).query | tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | provenance | Config |
-| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | tainted-access-paths.js:48:7:48:48 | path | provenance |  |
+| tainted-access-paths.js:48:14:48:48 | url.par ... ry.path | tainted-access-paths.js:48:7:48:10 | path | provenance |  |
 | tainted-access-paths.js:48:24:48:30 | req.url | tainted-access-paths.js:48:14:48:37 | url.par ... , true) | provenance | Config |
-| tainted-promise-steps.js:6:7:6:48 | path | tainted-promise-steps.js:7:26:7:29 | path | provenance |  |
+| tainted-promise-steps.js:6:7:6:10 | path | tainted-promise-steps.js:7:26:7:29 | path | provenance |  |
 | tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-promise-steps.js:6:14:6:43 | url.par ... ).query | tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | tainted-promise-steps.js:6:7:6:48 | path | provenance |  |
+| tainted-promise-steps.js:6:14:6:48 | url.par ... ry.path | tainted-promise-steps.js:6:7:6:10 | path | provenance |  |
 | tainted-promise-steps.js:6:24:6:30 | req.url | tainted-promise-steps.js:6:14:6:37 | url.par ... , true) | provenance | Config |
 | tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | tainted-promise-steps.js:10:23:10:33 | pathPromise [PromiseValue] | provenance |  |
 | tainted-promise-steps.js:7:26:7:29 | path | tainted-promise-steps.js:7:10:7:30 | Promise ... e(path) [PromiseValue] | provenance |  |
@@ -730,23 +730,23 @@ edges
 | 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 |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:11:18:11:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:13:18:13:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:14:33:14:36 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:15:42:15:45 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:17:18:17:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:18:18:18:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:22:18:22:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:23:18:23:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:24:18:24:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:26:18:26:21 | path | provenance |  |
-| tainted-string-steps.js:6:7:6:48 | path | tainted-string-steps.js:27:18:27:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:8:18:8:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:9:18:9:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:10:18:10:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:11:18:11:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:13:18:13:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:14:33:14:36 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:15:42:15:45 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:17:18:17:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:18:18:18:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:22:18:22:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:23:18:23:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:24:18:24:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:26:18:26:21 | path | provenance |  |
+| tainted-string-steps.js:6:7:6:10 | path | tainted-string-steps.js:27:18:27:21 | path | provenance |  |
 | tainted-string-steps.js:6:14:6:37 | url.par ... , true) | tainted-string-steps.js:6:14:6:43 | url.par ... ).query | provenance | Config |
 | tainted-string-steps.js:6:14:6:43 | url.par ... ).query | tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | provenance | Config |
-| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | tainted-string-steps.js:6:7:6:48 | path | provenance |  |
+| tainted-string-steps.js:6:14:6:48 | url.par ... ry.path | tainted-string-steps.js:6:7:6:10 | path | provenance |  |
 | tainted-string-steps.js:6:24:6:30 | req.url | tainted-string-steps.js:6:14:6:37 | url.par ... , true) | provenance | Config |
 | tainted-string-steps.js:8:18:8:21 | path | tainted-string-steps.js:8:18:8:34 | path.substring(4) | provenance | Config |
 | tainted-string-steps.js:9:18:9:21 | path | tainted-string-steps.js:9:18:9:37 | path.substring(0, i) | provenance | Config |
@@ -766,34 +766,34 @@ edges
 | tainted-string-steps.js:26:18:26:21 | path | tainted-string-steps.js:26:18:26:36 | path.split(unknown) | provenance | Config |
 | tainted-string-steps.js:26:18:26:36 | path.split(unknown) | tainted-string-steps.js:26:18:26:45 | path.sp ... hatever | provenance | Config |
 | tainted-string-steps.js:27:18:27:21 | path | tainted-string-steps.js:27:18:27:36 | path.split(unknown) | provenance | Config |
-| torrents.js:5:6:5:38 | name | torrents.js:6:24:6:27 | name | provenance |  |
-| torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:5:6:5:38 | name | provenance |  |
-| 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:5:6:5:9 | name | torrents.js:6:24:6:27 | name | provenance |  |
+| torrents.js:5:13:5:38 | parseTo ... t).name | torrents.js:5:6:5:9 | name | provenance |  |
+| torrents.js:6:6:6:8 | loc | torrents.js:7:25:7:27 | loc | provenance |  |
+| torrents.js:6:12:6:45 | dir + " ... t.data" | torrents.js:6:6:6:8 | 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: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:7:9:10 | path | typescript.ts:11:29:11:32 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:19:15:19:18 | path | provenance |  |
+| typescript.ts:9:7:9:10 | path | typescript.ts:22:15:22:18 | path | provenance |  |
+| typescript.ts:9:7:9:10 | 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:14:9:48 | url.par ... ry.path | typescript.ts:9:7:9:10 | path | provenance |  |
 | typescript.ts:9:24:9:30 | req.url | typescript.ts:9:14:9:37 | url.par ... , true) | provenance | Config |
-| 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 |  |
+| typescript.ts:19:7:19:11 | path3 | typescript.ts:20:39:20:43 | path3 | provenance |  |
+| typescript.ts:19:15:19:18 | path | typescript.ts:19:7:19:11 | path3 | provenance |  |
+| typescript.ts:22:7:22:11 | path4 | typescript.ts:23:39:23:43 | path4 | provenance |  |
+| typescript.ts:22:15:22:18 | path | typescript.ts:22:7:22:11 | path4 | provenance |  |
+| typescript.ts:29:7:29:11 | path6 | typescript.ts:31:29:31:33 | path6 | provenance |  |
+| typescript.ts:29:15:29:18 | path | typescript.ts:29:7:29:11 | path6 | provenance |  |
 nodes
-| TaintedPath-es6.js:7:7:7:44 | path | semmle.label | path |
+| TaintedPath-es6.js:7:7:7:10 | 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:7:9:10 | 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 |
@@ -805,7 +805,7 @@ nodes
 | 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:3:36:6 | 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 |
@@ -838,7 +838,7 @@ nodes
 | 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:6:73:9 | 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 |
@@ -848,19 +848,19 @@ nodes
 | 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:6:109:9 | 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:7:115:10 | 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:7:119:11 | 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 |
@@ -870,19 +870,19 @@ nodes
 | 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:7:128:15 | 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:7:131:16 | 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:7:139:10 | 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 |
@@ -913,7 +913,7 @@ nodes
 | 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:7:184:10 | 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 |
@@ -921,14 +921,14 @@ nodes
 | 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:7:191:10 | 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:7:200:10 | 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 |
@@ -937,27 +937,27 @@ nodes
 | 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:7:212:10 | 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:9:213:22 | 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:9:215:23 | 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:7:8:14 | 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 |
-| execa.js:6:9:6:64 | filePath | semmle.label | filePath |
+| execa.js:6:9:6:16 | filePath | semmle.label | filePath |
 | execa.js:6:20:6:43 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:6:20:6:49 | url.par ... ).query | semmle.label | url.par ... ).query |
 | execa.js:6:20:6:61 | url.par ... ePath"] | semmle.label | url.par ... ePath"] |
@@ -974,14 +974,14 @@ nodes
 | 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:19:14:26 | 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 |
-| make-dir.js:7:11:7:31 | file | semmle.label | file |
+| make-dir.js:7:11:7:14 | file | semmle.label | file |
 | make-dir.js:7:18:7:31 | req.query.file | semmle.label | req.query.file |
 | make-dir.js:9:25:9:28 | file | semmle.label | file |
 | make-dir.js:10:23:10:26 | file | semmle.label | file |
-| mkdirp.js:9:11:9:76 | dirPath | semmle.label | dirPath |
+| mkdirp.js:9:11:9:17 | dirPath | semmle.label | dirPath |
 | mkdirp.js:9:21:9:76 | path.jo ... ltDir') | semmle.label | path.jo ... ltDir') |
 | mkdirp.js:9:42:9:59 | req.query.filename | semmle.label | req.query.filename |
 | mkdirp.js:9:42:9:75 | req.que ... ultDir' | semmle.label | req.que ... ultDir' |
@@ -997,7 +997,7 @@ nodes
 | mkdirp.js:20:29:20:35 | dirPath | semmle.label | dirPath |
 | mkdirp.js:21:23:21:29 | dirPath | semmle.label | dirPath |
 | 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: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 |
@@ -1023,7 +1023,7 @@ nodes
 | 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:7:11:10 | 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 |
@@ -1034,7 +1034,7 @@ nodes
 | 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:7:21:10 | 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 |
@@ -1046,57 +1046,57 @@ nodes
 | 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:7:31:10 | 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:7:54:10 | 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:7:73:10 | 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:7:82:10 | 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:7:94:10 | 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:7:117:10 | 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:7:130:10 | 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:7:139:10 | 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:7:148:10 | 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:7:160:10 | 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:7:174:10 | 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 |
@@ -1104,80 +1104,80 @@ nodes
 | 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:7:201:20 | 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:7:214:10 | 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:3:219:6 | 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:7:226:10 | 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:7:236:10 | 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:7:254:10 | 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:7:267:13 | 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:7:275:13 | 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:7:283:13 | 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:7:291:13 | 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:6:303:9 | 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:6:320:19 | 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:6:339:9 | 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:7:354:10 | 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:7:358:17 | 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:7:377:10 | 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:7:385:10 | 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 |
@@ -1188,16 +1188,16 @@ nodes
 | 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:7:412:10 | 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 |
-| open.js:7:11:7:31 | file | semmle.label | file |
+| open.js:7:11:7:14 | file | semmle.label | file |
 | open.js:7:18:7:31 | req.query.file | semmle.label | req.query.file |
 | open.js:9:10:9:13 | file | semmle.label | file |
 | open.js:10:13:10:16 | file | semmle.label | file |
-| other-fs-libraries.js:9:7:9:48 | path | semmle.label | path |
+| other-fs-libraries.js:9:7:9:10 | 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 |
@@ -1210,7 +1210,7 @@ nodes
 | 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:7:38:10 | 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 |
@@ -1218,7 +1218,7 @@ nodes
 | 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:7:49:10 | 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 |
@@ -1231,7 +1231,7 @@ nodes
 | 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:7:68:10 | 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 |
@@ -1242,23 +1242,23 @@ nodes
 | 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:7:81:10 | 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: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:9:5:15 | 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 |
 | rimraf.js:8:11:8:18 | { path } | semmle.label | { path } |
-| rimraf.js:8:11:8:29 | path | semmle.label | path |
+| rimraf.js:8:13:8:16 | path | semmle.label | path |
 | rimraf.js:8:13:8:16 | path | semmle.label | path |
 | rimraf.js:8:22:8:29 | req.body | semmle.label | req.body |
 | rimraf.js:10:17:10:20 | path | semmle.label | path |
@@ -1284,13 +1284,13 @@ nodes
 | 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:7:6:10 | 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:7:10:9 | 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 |
@@ -1302,19 +1302,19 @@ nodes
 | 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:7:39:10 | 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:7:48:10 | 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:7:6:10 | 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 |
@@ -1343,7 +1343,7 @@ nodes
 | 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:7:6:10 | 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 |
@@ -1380,25 +1380,25 @@ nodes
 | 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:6:5:9 | 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:6:6:8 | 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:7:9:10 | 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:7:19:11 | 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:7:22:11 | 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:7:29:11 | 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] |
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 f8916181de12..d5c5f012a76a 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
@@ -10,41 +10,41 @@
 | 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:9:5:16 | fileName | ZipSlipBad2.js:6:22:6:29 | fileName | provenance |  |
+| ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | ZipSlipBad2.js:5:9:5:16 | 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:7:11:7:18 | fileName | ZipSlipBad.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBad.js:7:22:7:31 | entry.path | ZipSlipBad.js:7:11:7:18 | fileName | provenance |  |
+| ZipSlipBad.js:15:11:15:18 | fileName | ZipSlipBad.js:16:30:16:37 | fileName | provenance |  |
+| ZipSlipBad.js:15:22:15:31 | entry.path | ZipSlipBad.js:15:11:15:18 | fileName | provenance |  |
+| ZipSlipBad.js:22:11:22:18 | fileName | ZipSlipBad.js:23:28:23:35 | fileName | provenance |  |
+| ZipSlipBad.js:22:22:22:31 | entry.path | ZipSlipBad.js:22:11:22:18 | 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 |  |
+| ZipSlipBadUnzipper.js:7:9:7:16 | fileName | ZipSlipBadUnzipper.js:8:37:8:44 | fileName | provenance |  |
+| ZipSlipBadUnzipper.js:7:20:7:29 | entry.path | ZipSlipBadUnzipper.js:7:9:7:16 | 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 |
 | TarSlipBad.js:9:17:9:31 | header.linkname | semmle.label | header.linkname |
-| ZipSlipBad2.js:5:9:5:46 | fileName | semmle.label | fileName |
+| ZipSlipBad2.js:5:9:5:16 | fileName | semmle.label | fileName |
 | ZipSlipBad2.js:5:20:5:46 | 'output ... ry.path | semmle.label | 'output ... ry.path |
 | ZipSlipBad2.js:5:37:5:46 | entry.path | semmle.label | entry.path |
 | ZipSlipBad2.js:6:22:6:29 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:7:11:7:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:7:11:7:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:7:22:7:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:8:37:8:44 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:15:11:15:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:15:11:15:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:15:22:15:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:16:30:16:37 | fileName | semmle.label | fileName |
-| ZipSlipBad.js:22:11:22:31 | fileName | semmle.label | fileName |
+| ZipSlipBad.js:22:11:22:18 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:22:22:22:31 | entry.path | semmle.label | entry.path |
 | ZipSlipBad.js:23:28:23:35 | fileName | semmle.label | fileName |
 | ZipSlipBad.js:30:14:30:17 | name | semmle.label | name |
 | ZipSlipBad.js:31:26:31:29 | name | semmle.label | name |
 | ZipSlipBad.js:34:16:34:19 | name | semmle.label | name |
 | ZipSlipBad.js:35:26:35:29 | name | semmle.label | name |
-| ZipSlipBadUnzipper.js:7:9:7:29 | fileName | semmle.label | fileName |
+| ZipSlipBadUnzipper.js:7:9:7:16 | 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 |
 subpaths
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 32b2875a86cf..9962113d8066 100644
--- a/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-073/TemplateObjectInjection.expected
@@ -10,67 +10,67 @@
 | 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:9:6:21 | 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:6:25:6:46 | req.bod ... rameter | tst2.js:6:9:6:21 | bodyParameter | provenance |  |
+| tst2.js:26:9:26:21 | 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:26:25:26:46 | req.bod ... rameter | tst2.js:26:9:26:21 | bodyParameter | provenance |  |
+| tst2.js:34:9:34:21 | 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:34:25:34:46 | req.bod ... rameter | tst2.js:34:9:34:21 | bodyParameter | provenance |  |
+| tst2.js:42:9:42:21 | 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:42:25:42:46 | req.bod ... rameter | tst2.js:42:9:42:21 | bodyParameter | provenance |  |
+| tst2.js:51:9:51:21 | 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 |  |
+| tst2.js:51:25:51:46 | req.bod ... rameter | tst2.js:51:9:51:21 | bodyParameter | provenance |  |
+| tst.js:7:9:7:21 | 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:7:25:7:46 | req.bod ... rameter | tst.js:7:9:7:21 | bodyParameter | provenance |  |
+| tst.js:8:9:8:22 | queryParameter | tst.js:11:28:11:41 | queryParameter | provenance |  |
+| tst.js:8:9:8:22 | queryParameter | tst.js:20:19:20:32 | queryParameter | provenance |  |
+| tst.js:8:26:8:49 | req.que ... rameter | tst.js:8:9:8:22 | 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:11:26:13 | 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:26:17:26:24 | obj + "" | tst.js:26:11:26:13 | 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 |
+| tst2.js:6:9:6:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:6:25:6:32 | req.body | semmle.label | req.body |
 | tst2.js:6:25:6:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:7:28:7:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:26:9:26:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:26:9:26:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:26:25:26:32 | req.body | semmle.label | req.body |
 | tst2.js:26:25:26:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:27:28:27:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:34:9:34:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:34:9:34:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:34:25:34:32 | req.body | semmle.label | req.body |
 | tst2.js:34:25:34:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:35:28:35:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:42:9:42:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:42:9:42:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:42:25:42:32 | req.body | semmle.label | req.body |
 | tst2.js:42:25:42:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:43:28:43:40 | bodyParameter | semmle.label | bodyParameter |
-| tst2.js:51:9:51:46 | bodyParameter | semmle.label | bodyParameter |
+| tst2.js:51:9:51:21 | bodyParameter | semmle.label | bodyParameter |
 | tst2.js:51:25:51:32 | req.body | semmle.label | req.body |
 | tst2.js:51:25:51:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
 | tst2.js:52:28:52:40 | bodyParameter | semmle.label | bodyParameter |
-| tst.js:7:9:7:46 | bodyParameter | semmle.label | bodyParameter |
+| tst.js:7:9:7:21 | bodyParameter | semmle.label | bodyParameter |
 | tst.js:7:25:7:32 | req.body | semmle.label | req.body |
 | tst.js:7:25:7:46 | req.bod ... rameter | semmle.label | req.bod ... rameter |
-| tst.js:8:9:8:49 | queryParameter | semmle.label | queryParameter |
+| tst.js:8:9:8:22 | queryParameter | semmle.label | queryParameter |
 | tst.js:8:26:8:49 | req.que ... rameter | semmle.label | req.que ... rameter |
 | tst.js:10:28:10:40 | bodyParameter | semmle.label | bodyParameter |
 | tst.js:11:28:11:41 | queryParameter | semmle.label | queryParameter |
 | tst.js:20:19:20:32 | queryParameter | semmle.label | queryParameter |
 | tst.js:23:24:23:26 | obj | semmle.label | obj |
 | tst.js:24:28:24:30 | obj | semmle.label | obj |
-| tst.js:26:11:26:24 | str | semmle.label | str |
+| tst.js:26:11:26:13 | str | semmle.label | str |
 | tst.js:26:17:26:19 | obj | semmle.label | obj |
 | tst.js:26:17:26:24 | obj + "" | semmle.label | obj + "" |
 | tst.js:29:28:29:42 | JSON.parse(str) | semmle.label | JSON.parse(str) |
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 862255f70f23..dc9c65822ba0 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
@@ -84,32 +84,32 @@
 | 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 |  |
+| actions.js:8:9:8:13 | title | actions.js:9:16:9:20 | title | provenance |  |
+| actions.js:8:17:8:57 | github. ... t.title | actions.js:8:9:8:13 | title | provenance |  |
 | actions.js:9:16:9:20 | title | actions.js:9:8:9:22 | `echo ${title}` | provenance |  |
-| actions.js:18:9:18:63 | head_ref | actions.js:19:22:19:29 | head_ref | provenance |  |
-| actions.js:18:20:18:63 | github. ... ead.ref | actions.js:18:9:18:63 | head_ref | provenance |  |
+| actions.js:18:9:18:16 | head_ref | actions.js:19:22:19:29 | head_ref | provenance |  |
+| actions.js:18:20:18:63 | github. ... ead.ref | actions.js:18:9:18:16 | head_ref | provenance |  |
 | actions.js:19:22:19:29 | head_ref | actions.js:19:14:19:31 | `echo ${head_ref}` | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:17:13:17:15 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:18:17:18:19 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:19:17:19:19 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:20:21:20:23 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:21:14:21:16 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:22:18:22:20 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:23:13:23:15 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:25:21:25:23 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:39:26:39:28 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:43:15:43:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:53:15:53:17 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
-| child_process-test.js:6:9:6:49 | cmd | child_process-test.js:57:46:57:48 | cmd | provenance |  |
-| child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:9:6:49 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:17:13:17:15 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:18:17:18:19 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:19:17:19:19 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:20:21:20:23 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:21:14:21:16 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:22:18:22:20 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:23:13:23:15 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:25:21:25:23 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:39:26:39:28 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:43:15:43:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:48:15:48:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:53:15:53:17 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:56:54:56:56 | cmd | provenance |  |
+| child_process-test.js:6:9:6:11 | cmd | child_process-test.js:57:46:57:48 | cmd | provenance |  |
+| child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:9:6:11 | cmd | provenance |  |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:15:6:49 | url.par ... ry.path | provenance |  |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | child_process-test.js:6:15:6:49 | url.par ... ry.path | provenance |  |
-| child_process-test.js:6:15:6:49 | url.par ... ry.path | child_process-test.js:6:9:6:49 | cmd | provenance |  |
+| child_process-test.js:6:15:6:49 | url.par ... ry.path | child_process-test.js:6:9:6:11 | cmd | provenance |  |
 | child_process-test.js:6:25:6:31 | req.url | child_process-test.js:6:15:6:38 | url.par ... , true) | provenance |  |
 | child_process-test.js:25:21:25:23 | cmd | child_process-test.js:25:13:25:31 | "foo" + cmd + "bar" | provenance |  |
 | child_process-test.js:48:5:48:8 | [post update] args [1] | child_process-test.js:49:15:49:18 | args [1] | provenance |  |
@@ -118,47 +118,47 @@ edges
 | child_process-test.js:56:46:56:57 | ["bar", cmd] [1] | child_process-test.js:56:25:56:58 | ['/C',  ... , cmd]) | provenance |  |
 | child_process-test.js:56:54:56:56 | cmd | child_process-test.js:56:46:56:57 | ["bar", cmd] [1] | provenance |  |
 | child_process-test.js:57:46:57:48 | cmd | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | provenance |  |
-| child_process-test.js:73:9:73:49 | cmd | child_process-test.js:75:29:75:31 | cmd | provenance |  |
-| child_process-test.js:73:15:73:38 | url.par ... , true) | child_process-test.js:73:9:73:49 | cmd | provenance |  |
+| child_process-test.js:73:9:73:11 | cmd | child_process-test.js:75:29:75:31 | cmd | provenance |  |
+| child_process-test.js:73:15:73:38 | url.par ... , true) | child_process-test.js:73:9:73:11 | cmd | provenance |  |
 | child_process-test.js:73:25:73:31 | req.url | child_process-test.js:73:15:73:38 | url.par ... , true) | provenance |  |
 | child_process-test.js:94:21:94:30 | ctx.params | child_process-test.js:94:11:94:35 | "ping " ... ms.host | provenance |  |
-| command-line-libs.js:9:9:9:34 | args | command-line-libs.js:12:17:12:20 | args | provenance |  |
-| command-line-libs.js:9:9:9:34 | args | command-line-libs.js:23:29:23:32 | args | provenance |  |
-| command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:9:9:9:34 | args | provenance |  |
+| command-line-libs.js:9:9:9:12 | args | command-line-libs.js:12:17:12:20 | args | provenance |  |
+| command-line-libs.js:9:9:9:12 | args | command-line-libs.js:23:29:23:32 | args | provenance |  |
+| command-line-libs.js:9:16:9:23 | req.body | command-line-libs.js:9:9:9:12 | args | provenance |  |
 | command-line-libs.js:12:17:12:20 | args | command-line-libs.js:13:19:13:32 | program.opts() | provenance |  |
 | command-line-libs.js:12:17:12:20 | args | command-line-libs.js:15:8:15:18 | program.cmd | provenance |  |
 | command-line-libs.js:12:17:12:20 | args | command-line-libs.js:20:14:20:19 | script | provenance |  |
-| command-line-libs.js:13:9:13:32 | options | command-line-libs.js:14:8:14:14 | options | provenance |  |
-| command-line-libs.js:13:19:13:32 | program.opts() | command-line-libs.js:13:9:13:32 | options | provenance |  |
+| command-line-libs.js:13:9:13:15 | options | command-line-libs.js:14:8:14:14 | options | provenance |  |
+| command-line-libs.js:13:19:13:32 | program.opts() | command-line-libs.js:13:9:13:15 | options | provenance |  |
 | command-line-libs.js:14:8:14:14 | options | command-line-libs.js:14:8:14:18 | options.cmd | provenance |  |
 | command-line-libs.js:20:14:20:19 | script | command-line-libs.js:21:12:21:17 | script | provenance |  |
 | command-line-libs.js:23:29:23:32 | args | command-line-libs.js:20:14:20:19 | script | provenance |  |
-| command-line-libs.js:27:11:27:41 | argsArray | command-line-libs.js:28:53:28:61 | argsArray | provenance |  |
-| command-line-libs.js:27:23:27:30 | req.body | command-line-libs.js:27:11:27:41 | argsArray | provenance |  |
-| command-line-libs.js:28:11:28:64 | parsed | command-line-libs.js:29:10:29:15 | parsed | provenance |  |
-| command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | command-line-libs.js:28:11:28:64 | parsed | provenance |  |
+| command-line-libs.js:27:11:27:19 | argsArray | command-line-libs.js:28:53:28:61 | argsArray | provenance |  |
+| command-line-libs.js:27:23:27:30 | req.body | command-line-libs.js:27:11:27:19 | argsArray | provenance |  |
+| command-line-libs.js:28:11:28:16 | parsed | command-line-libs.js:29:10:29:15 | parsed | provenance |  |
+| command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | command-line-libs.js:28:11:28:16 | parsed | provenance |  |
 | command-line-libs.js:28:53:28:61 | argsArray | command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | provenance |  |
 | command-line-libs.js:29:10:29:15 | parsed | command-line-libs.js:29:10:29:24 | parsed['--cmd'] | provenance |  |
-| command-line-libs.js:35:9:35:83 | options | command-line-libs.js:37:8:37:14 | options | provenance |  |
-| command-line-libs.js:35:19:35:83 | command ... \| [] }) | command-line-libs.js:35:9:35:83 | options | provenance |  |
+| command-line-libs.js:35:9:35:15 | options | command-line-libs.js:37:8:37:14 | options | provenance |  |
+| command-line-libs.js:35:19:35:83 | command ... \| [] }) | command-line-libs.js:35:9:35:15 | options | provenance |  |
 | command-line-libs.js:35:62:35:69 | req.body | command-line-libs.js:35:19:35:83 | command ... \| [] }) | provenance |  |
 | command-line-libs.js:37:8:37:14 | options | command-line-libs.js:37:8:37:18 | options.cmd | provenance |  |
-| command-line-libs.js:42:9:42:34 | args | command-line-libs.js:43:24:43:27 | args | provenance |  |
-| command-line-libs.js:42:16:42:23 | req.body | command-line-libs.js:42:9:42:34 | args | provenance |  |
-| command-line-libs.js:43:9:47:12 | parsed | command-line-libs.js:49:8:49:13 | parsed | provenance |  |
+| command-line-libs.js:42:9:42:12 | args | command-line-libs.js:43:24:43:27 | args | provenance |  |
+| command-line-libs.js:42:16:42:23 | req.body | command-line-libs.js:42:9:42:12 | args | provenance |  |
+| command-line-libs.js:43:9:43:14 | parsed | command-line-libs.js:49:8:49:13 | parsed | provenance |  |
 | command-line-libs.js:43:18:43:28 | yargs(args) | command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | provenance |  |
 | command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | command-line-libs.js:43:18:47:12 | yargs(a ... parse() | provenance |  |
-| command-line-libs.js:43:18:47:12 | yargs(a ... parse() | command-line-libs.js:43:9:47:12 | parsed | provenance |  |
+| command-line-libs.js:43:18:47:12 | yargs(a ... parse() | command-line-libs.js:43:9:43:14 | parsed | provenance |  |
 | command-line-libs.js:43:24:43:27 | args | command-line-libs.js:43:18:43:28 | yargs(args) | provenance |  |
 | command-line-libs.js:49:8:49:13 | parsed | command-line-libs.js:49:8:49:17 | parsed.cmd | provenance |  |
 | exec-sh2.js:9:17:9:23 | command | exec-sh2.js:10:40:10:46 | command | provenance |  |
-| exec-sh2.js:14:9:14:49 | cmd | exec-sh2.js:15:12:15:14 | cmd | provenance |  |
-| exec-sh2.js:14:15:14:38 | url.par ... , true) | exec-sh2.js:14:9:14:49 | cmd | provenance |  |
+| exec-sh2.js:14:9:14:11 | cmd | exec-sh2.js:15:12:15:14 | cmd | provenance |  |
+| exec-sh2.js:14:15:14:38 | url.par ... , true) | exec-sh2.js:14:9:14:11 | cmd | provenance |  |
 | exec-sh2.js:14:25:14:31 | req.url | exec-sh2.js:14:15:14:38 | url.par ... , true) | provenance |  |
 | exec-sh2.js:15:12:15:14 | cmd | exec-sh2.js:9:17:9:23 | command | provenance |  |
 | exec-sh.js:13:17:13:23 | command | exec-sh.js:15:44:15:50 | command | provenance |  |
-| exec-sh.js:19:9:19:49 | cmd | exec-sh.js:20:12:20:14 | cmd | provenance |  |
-| exec-sh.js:19:15:19:38 | url.par ... , true) | exec-sh.js:19:9:19:49 | cmd | provenance |  |
+| exec-sh.js:19:9:19:11 | cmd | exec-sh.js:20:12:20:14 | cmd | provenance |  |
+| exec-sh.js:19:15:19:38 | url.par ... , true) | exec-sh.js:19:9:19:11 | cmd | provenance |  |
 | exec-sh.js:19:25:19:31 | req.url | exec-sh.js:19:15:19:38 | url.par ... , true) | provenance |  |
 | exec-sh.js:20:12:20:14 | cmd | exec-sh.js:13:17:13:23 | command | provenance |  |
 | execSeries.js:3:20:3:22 | arr [0] | execSeries.js:5:3:10:4 | (functi ... );\\n  }) [arr, 0] | provenance |  |
@@ -169,45 +169,45 @@ edges
 | execSeries.js:13:19:13:26 | commands [0] | execSeries.js:14:13:14:20 | commands [0] | provenance |  |
 | execSeries.js:14:13:14:20 | commands [0] | execSeries.js:3:20:3:22 | arr [0] | provenance |  |
 | execSeries.js:14:24:14:30 | command | execSeries.js:14:41:14:47 | command | provenance |  |
-| execSeries.js:18:7:18:58 | cmd | execSeries.js:19:13:19:15 | cmd | provenance |  |
-| execSeries.js:18:13:18:47 | require ... , true) | execSeries.js:18:7:18:58 | cmd | provenance |  |
+| execSeries.js:18:7:18:9 | cmd | execSeries.js:19:13:19:15 | cmd | provenance |  |
+| execSeries.js:18:13:18:47 | require ... , true) | execSeries.js:18:7:18:9 | cmd | provenance |  |
 | execSeries.js:18:34:18:40 | req.url | execSeries.js:18:13:18:47 | require ... , true) | provenance |  |
 | execSeries.js:19:12:19:16 | [cmd] [0] | execSeries.js:13:19:13:26 | commands [0] | provenance |  |
 | execSeries.js:19:13:19:15 | cmd | execSeries.js:19:12:19:16 | [cmd] [0] | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:11:15:11:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:13:32:13:34 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:14:31:14:33 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:17:14:17:16 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:19:32:19:34 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:20:33:20:35 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:23:17:23:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:24:17:24:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:25:17:25:19 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:27:15:27:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:28:15:28:17 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:30:24:30:26 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:31:24:31:26 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:33:22:33:24 | cmd | provenance |  |
-| execa.js:6:9:6:54 | cmd | execa.js:34:22:34:24 | cmd | provenance |  |
-| execa.js:6:15:6:38 | url.par ... , true) | execa.js:6:9:6:54 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:11:15:11:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:13:32:13:34 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:14:31:14:33 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:17:14:17:16 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:19:32:19:34 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:20:33:20:35 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:23:17:23:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:24:17:24:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:25:17:25:19 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:27:15:27:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:28:15:28:17 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:30:24:30:26 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:31:24:31:26 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:33:22:33:24 | cmd | provenance |  |
+| execa.js:6:9:6:11 | cmd | execa.js:34:22:34:24 | cmd | provenance |  |
+| execa.js:6:15:6:38 | url.par ... , true) | execa.js:6:9:6:11 | cmd | provenance |  |
 | execa.js:6:25:6:31 | req.url | execa.js:6:15:6:38 | url.par ... , true) | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:30:30:30:33 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:31:30:31:33 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:33:28:33:31 | arg1 | provenance |  |
-| execa.js:7:9:7:53 | arg1 | execa.js:34:28:34:31 | arg1 | provenance |  |
-| execa.js:7:16:7:39 | url.par ... , true) | execa.js:7:9:7:53 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:30:30:30:33 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:31:30:31:33 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:33:28:33:31 | arg1 | provenance |  |
+| execa.js:7:9:7:12 | arg1 | execa.js:34:28:34:31 | arg1 | provenance |  |
+| execa.js:7:16:7:39 | url.par ... , true) | execa.js:7:9:7:12 | arg1 | provenance |  |
 | execa.js:7:26:7:32 | req.url | execa.js:7:16:7:39 | url.par ... , true) | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:30:37:30:40 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:31:37:31:40 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:33:35:33:38 | arg2 | provenance |  |
-| execa.js:8:9:8:53 | arg2 | execa.js:34:35:34:38 | arg2 | provenance |  |
-| execa.js:8:16:8:39 | url.par ... , true) | execa.js:8:9:8:53 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:30:37:30:40 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:31:37:31:40 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:33:35:33:38 | arg2 | provenance |  |
+| execa.js:8:9:8:12 | arg2 | execa.js:34:35:34:38 | arg2 | provenance |  |
+| execa.js:8:16:8:39 | url.par ... , true) | execa.js:8:9:8:12 | arg2 | provenance |  |
 | execa.js:8:26:8:32 | req.url | execa.js:8:16:8:39 | url.par ... , true) | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:30:44:30:47 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:31:44:31:47 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:33:42:33:45 | arg3 | provenance |  |
-| execa.js:9:9:9:53 | arg3 | execa.js:34:42:34:45 | arg3 | provenance |  |
-| execa.js:9:16:9:39 | url.par ... , true) | execa.js:9:9:9:53 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:30:44:30:47 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:31:44:31:47 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:33:42:33:45 | arg3 | provenance |  |
+| execa.js:9:9:9:12 | arg3 | execa.js:34:42:34:45 | arg3 | provenance |  |
+| execa.js:9:16:9:39 | url.par ... , true) | execa.js:9:9:9:12 | arg3 | provenance |  |
 | execa.js:9:26:9:32 | req.url | execa.js:9:16:9:39 | url.par ... , true) | provenance |  |
 | execa.js:30:24:30:26 | cmd | execa.js:30:24:30:47 | cmd + a ...  + arg3 | provenance |  |
 | execa.js:30:30:30:33 | arg1 | execa.js:30:24:30:47 | cmd + a ...  + arg3 | provenance |  |
@@ -239,37 +239,37 @@ edges
 | form-parsers.js:53:21:53:26 | fields | form-parsers.js:53:10:53:31 | "touch  ... ds.name | provenance |  |
 | form-parsers.js:58:30:58:33 | part | form-parsers.js:59:21:59:24 | part | provenance |  |
 | form-parsers.js:59:21:59:24 | part | form-parsers.js:59:10:59:33 | "touch  ... ilename | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:7:33:7:35 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:8:28:8:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:9:32:9:34 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:10:29:10:31 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:11:29:11:31 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:12:27:12:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:14:28:14:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:15:34:15:36 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:16:21:16:23 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:17:27:17:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:18:22:18:24 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:19:36:19:38 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:22:21:22:23 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:23:28:23:30 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:26:34:26:36 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:28:27:28:29 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:30:33:30:35 | cmd | provenance |  |
-| other.js:5:9:5:49 | cmd | other.js:34:44:34:46 | cmd | provenance |  |
-| other.js:5:15:5:38 | url.par ... , true) | other.js:5:9:5:49 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:7:33:7:35 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:8:28:8:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:9:32:9:34 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:10:29:10:31 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:11:29:11:31 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:12:27:12:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:14:28:14:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:15:34:15:36 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:16:21:16:23 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:17:27:17:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:18:22:18:24 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:19:36:19:38 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:22:21:22:23 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:23:28:23:30 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:26:34:26:36 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:28:27:28:29 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:30:33:30:35 | cmd | provenance |  |
+| other.js:5:9:5:11 | cmd | other.js:34:44:34:46 | cmd | provenance |  |
+| other.js:5:15:5:38 | url.par ... , true) | other.js:5:9:5:11 | cmd | provenance |  |
 | other.js:5:25:5:31 | req.url | other.js:5:15:5:38 | url.par ... , true) | provenance |  |
 | third-party-command-injection.js:5:20:5:26 | command | third-party-command-injection.js:6:21:6:27 | command | provenance |  |
 nodes
-| actions.js:8:9:8:57 | title | semmle.label | title |
+| actions.js:8:9:8:13 | title | semmle.label | title |
 | actions.js:8:17:8:57 | github. ... t.title | semmle.label | github. ... t.title |
 | actions.js:9:8:9:22 | `echo ${title}` | semmle.label | `echo ${title}` |
 | actions.js:9:16:9:20 | title | semmle.label | title |
-| actions.js:18:9:18:63 | head_ref | semmle.label | head_ref |
+| actions.js:18:9:18:16 | head_ref | semmle.label | head_ref |
 | actions.js:18:20:18:63 | github. ... ead.ref | semmle.label | github. ... ead.ref |
 | actions.js:19:14:19:31 | `echo ${head_ref}` | semmle.label | `echo ${head_ref}` |
 | actions.js:19:22:19:29 | head_ref | semmle.label | head_ref |
-| child_process-test.js:6:9:6:49 | cmd | semmle.label | cmd |
+| child_process-test.js:6:9:6:11 | cmd | semmle.label | cmd |
 | child_process-test.js:6:15:6:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | child_process-test.js:6:15:6:49 | url.par ... ry.path | semmle.label | url.par ... ry.path |
 | child_process-test.js:6:15:6:49 | url.par ... ry.path | semmle.label | url.par ... ry.path |
@@ -297,17 +297,17 @@ nodes
 | child_process-test.js:57:25:57:49 | ['/C',  ... at(cmd) | semmle.label | ['/C',  ... at(cmd) |
 | child_process-test.js:57:46:57:48 | cmd | semmle.label | cmd |
 | child_process-test.js:66:19:66:22 | args | semmle.label | args |
-| child_process-test.js:73:9:73:49 | cmd | semmle.label | cmd |
+| child_process-test.js:73:9:73:11 | cmd | semmle.label | cmd |
 | child_process-test.js:73:15:73:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | child_process-test.js:73:25:73:31 | req.url | semmle.label | req.url |
 | child_process-test.js:75:29:75:31 | cmd | semmle.label | cmd |
 | child_process-test.js:83:19:83:36 | req.query.fileName | semmle.label | req.query.fileName |
 | child_process-test.js:94:11:94:35 | "ping " ... ms.host | semmle.label | "ping " ... ms.host |
 | child_process-test.js:94:21:94:30 | ctx.params | semmle.label | ctx.params |
-| command-line-libs.js:9:9:9:34 | args | semmle.label | args |
+| command-line-libs.js:9:9:9:12 | args | semmle.label | args |
 | command-line-libs.js:9:16:9:23 | req.body | semmle.label | req.body |
 | command-line-libs.js:12:17:12:20 | args | semmle.label | args |
-| command-line-libs.js:13:9:13:32 | options | semmle.label | options |
+| command-line-libs.js:13:9:13:15 | options | semmle.label | options |
 | command-line-libs.js:13:19:13:32 | program.opts() | semmle.label | program.opts() |
 | command-line-libs.js:14:8:14:14 | options | semmle.label | options |
 | command-line-libs.js:14:8:14:18 | options.cmd | semmle.label | options.cmd |
@@ -315,21 +315,21 @@ nodes
 | command-line-libs.js:20:14:20:19 | script | semmle.label | script |
 | command-line-libs.js:21:12:21:17 | script | semmle.label | script |
 | command-line-libs.js:23:29:23:32 | args | semmle.label | args |
-| command-line-libs.js:27:11:27:41 | argsArray | semmle.label | argsArray |
+| command-line-libs.js:27:11:27:19 | argsArray | semmle.label | argsArray |
 | command-line-libs.js:27:23:27:30 | req.body | semmle.label | req.body |
-| command-line-libs.js:28:11:28:64 | parsed | semmle.label | parsed |
+| command-line-libs.js:28:11:28:16 | parsed | semmle.label | parsed |
 | command-line-libs.js:28:20:28:64 | arg({ ' ... rray }) | semmle.label | arg({ ' ... rray }) |
 | command-line-libs.js:28:53:28:61 | argsArray | semmle.label | argsArray |
 | command-line-libs.js:29:10:29:15 | parsed | semmle.label | parsed |
 | command-line-libs.js:29:10:29:24 | parsed['--cmd'] | semmle.label | parsed['--cmd'] |
-| command-line-libs.js:35:9:35:83 | options | semmle.label | options |
+| command-line-libs.js:35:9:35:15 | options | semmle.label | options |
 | command-line-libs.js:35:19:35:83 | command ... \| [] }) | semmle.label | command ... \| [] }) |
 | command-line-libs.js:35:62:35:69 | req.body | semmle.label | req.body |
 | command-line-libs.js:37:8:37:14 | options | semmle.label | options |
 | command-line-libs.js:37:8:37:18 | options.cmd | semmle.label | options.cmd |
-| command-line-libs.js:42:9:42:34 | args | semmle.label | args |
+| command-line-libs.js:42:9:42:12 | args | semmle.label | args |
 | command-line-libs.js:42:16:42:23 | req.body | semmle.label | req.body |
-| command-line-libs.js:43:9:47:12 | parsed | semmle.label | parsed |
+| command-line-libs.js:43:9:43:14 | parsed | semmle.label | parsed |
 | command-line-libs.js:43:18:43:28 | yargs(args) | semmle.label | yargs(args) |
 | command-line-libs.js:43:18:47:4 | yargs(a ... ue\\n  }) | semmle.label | yargs(a ... ue\\n  }) |
 | command-line-libs.js:43:18:47:12 | yargs(a ... parse() | semmle.label | yargs(a ... parse() |
@@ -338,13 +338,13 @@ nodes
 | command-line-libs.js:49:8:49:17 | parsed.cmd | semmle.label | parsed.cmd |
 | exec-sh2.js:9:17:9:23 | command | semmle.label | command |
 | exec-sh2.js:10:40:10:46 | command | semmle.label | command |
-| exec-sh2.js:14:9:14:49 | cmd | semmle.label | cmd |
+| exec-sh2.js:14:9:14:11 | cmd | semmle.label | cmd |
 | exec-sh2.js:14:15:14:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | exec-sh2.js:14:25:14:31 | req.url | semmle.label | req.url |
 | exec-sh2.js:15:12:15:14 | cmd | semmle.label | cmd |
 | exec-sh.js:13:17:13:23 | command | semmle.label | command |
 | exec-sh.js:15:44:15:50 | command | semmle.label | command |
-| exec-sh.js:19:9:19:49 | cmd | semmle.label | cmd |
+| exec-sh.js:19:9:19:11 | cmd | semmle.label | cmd |
 | exec-sh.js:19:15:19:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | exec-sh.js:19:25:19:31 | req.url | semmle.label | req.url |
 | exec-sh.js:20:12:20:14 | cmd | semmle.label | cmd |
@@ -356,21 +356,21 @@ nodes
 | execSeries.js:14:13:14:20 | commands [0] | semmle.label | commands [0] |
 | execSeries.js:14:24:14:30 | command | semmle.label | command |
 | execSeries.js:14:41:14:47 | command | semmle.label | command |
-| execSeries.js:18:7:18:58 | cmd | semmle.label | cmd |
+| execSeries.js:18:7:18:9 | cmd | semmle.label | cmd |
 | execSeries.js:18:13:18:47 | require ... , true) | semmle.label | require ... , true) |
 | execSeries.js:18:34:18:40 | req.url | semmle.label | req.url |
 | execSeries.js:19:12:19:16 | [cmd] [0] | semmle.label | [cmd] [0] |
 | execSeries.js:19:13:19:15 | cmd | semmle.label | cmd |
-| execa.js:6:9:6:54 | cmd | semmle.label | cmd |
+| execa.js:6:9:6:11 | cmd | semmle.label | cmd |
 | execa.js:6:15:6:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:6:25:6:31 | req.url | semmle.label | req.url |
-| execa.js:7:9:7:53 | arg1 | semmle.label | arg1 |
+| execa.js:7:9:7:12 | arg1 | semmle.label | arg1 |
 | execa.js:7:16:7:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:7:26:7:32 | req.url | semmle.label | req.url |
-| execa.js:8:9:8:53 | arg2 | semmle.label | arg2 |
+| execa.js:8:9:8:12 | arg2 | semmle.label | arg2 |
 | execa.js:8:16:8:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:8:26:8:32 | req.url | semmle.label | req.url |
-| execa.js:9:9:9:53 | arg3 | semmle.label | arg3 |
+| execa.js:9:9:9:12 | arg3 | semmle.label | arg3 |
 | execa.js:9:16:9:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | execa.js:9:26:9:32 | req.url | semmle.label | req.url |
 | execa.js:11:15:11:17 | cmd | semmle.label | cmd |
@@ -425,7 +425,7 @@ nodes
 | form-parsers.js:58:30:58:33 | part | semmle.label | part |
 | form-parsers.js:59:10:59:33 | "touch  ... ilename | semmle.label | "touch  ... ilename |
 | form-parsers.js:59:21:59:24 | part | semmle.label | part |
-| other.js:5:9:5:49 | cmd | semmle.label | cmd |
+| other.js:5:9:5:11 | cmd | semmle.label | cmd |
 | other.js:5:15:5:38 | url.par ... , true) | semmle.label | url.par ... , true) |
 | other.js:5:25:5:31 | req.url | semmle.label | req.url |
 | other.js:7:33:7:35 | cmd | semmle.label | cmd |
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 9fc6f6b1bc4e..ee906376953a 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
@@ -51,51 +51,51 @@ edges
 | actions.js:19:22:19:32 | shelljs.env | actions.js:19:10:19:37 | 'rm -rf ... nv.SOME | provenance |  |
 | actions.js:20:22:20:32 | shelljs.env | actions.js:20:10:20:32 | 'rm -rf ... ljs.env | provenance |  |
 | 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] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:11:14:11:17 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:12:26:12:29 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | command-line-parameter-command-injection.js:14:18:14:21 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:11:14:11:17 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:12:26:12:29 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | command-line-parameter-command-injection.js:14:18:14:21 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | command-line-parameter-command-injection.js:10:6:10:33 | args | provenance |  |
-| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | command-line-parameter-command-injection.js:10:6:10:9 | args | provenance |  |
+| command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:11:14:11:17 | args | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:11:14:11:17 | args [ArrayElement] | command-line-parameter-command-injection.js:11:14:11:20 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:29 | args | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | command-line-parameter-command-injection.js:12:14:12:32 | "cmd.sh " + args[0] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | provenance |  |
-| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | provenance |  |
+| command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) [ArrayElement] | command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:15:14:15:22 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:15:14:15:25 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | provenance |  |
 | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | command-line-parameter-command-injection.js:16:14:16:37 | "cmd.sh ... Args[0] | provenance |  |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | provenance |  |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | provenance |  |
-| command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | command-line-parameter-command-injection.js:18:6:18:24 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | command-line-parameter-command-injection.js:18:6:18:9 | arg0 | provenance |  |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | provenance |  |
-| command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | command-line-parameter-command-injection.js:18:6:18:24 | arg0 | provenance |  |
+| command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | command-line-parameter-command-injection.js:18:6:18:9 | arg0 | provenance |  |
 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | command-line-parameter-command-injection.js:26:32:26:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | command-line-parameter-command-injection.js:27:32:27:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | command-line-parameter-command-injection.js:27:32:27:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | command-line-parameter-command-injection.js:26:32:26:35 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | command-line-parameter-command-injection.js:27:32:27:35 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | command-line-parameter-command-injection.js:27:32:27:35 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | provenance |  |
-| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | command-line-parameter-command-injection.js:24:8:24:35 | args | provenance |  |
-| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | provenance |  |
+| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | command-line-parameter-command-injection.js:24:8:24:11 | args | provenance |  |
+| command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:35 | args | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:35 | args [ArrayElement] | command-line-parameter-command-injection.js:26:32:26:38 | args[0] | provenance |  |
 | command-line-parameter-command-injection.js:26:32:26:38 | args[0] | command-line-parameter-command-injection.js:26:14:26:50 | `node $ ... ption"` | provenance |  |
@@ -105,43 +105,43 @@ edges
 | 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 | provenance |  |
 | 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 | provenance |  |
 | 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 | provenance |  |
-| command-line-parameter-command-injection.js:36:6:39:7 | args | command-line-parameter-command-injection.js:41:22:41:25 | args | provenance |  |
-| command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:36:6:39:7 | args | provenance |  |
+| command-line-parameter-command-injection.js:36:6:36:9 | args | command-line-parameter-command-injection.js:41:22:41:25 | args | provenance |  |
+| command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | command-line-parameter-command-injection.js:36:6:36:9 | args | provenance |  |
 | command-line-parameter-command-injection.js:41:22:41:25 | args | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | provenance |  |
 | 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 | provenance |  |
-| command-line-parameter-command-injection.js:47:8:53:12 | args | command-line-parameter-command-injection.js:55:22:55:25 | args | provenance |  |
 | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | provenance |  |
-| command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | command-line-parameter-command-injection.js:47:8:53:12 | args | provenance |  |
+| command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | command-line-parameter-command-injection.js:49:7:49:10 | args | provenance |  |
+| command-line-parameter-command-injection.js:49:7:49:10 | args | command-line-parameter-command-injection.js:55:22:55:25 | args | provenance |  |
 | command-line-parameter-command-injection.js:55:22:55:25 | args | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | provenance |  |
-| command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | provenance |  |
-| command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | provenance |  |
-| command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | provenance |  |
-| command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | provenance |  |
+| command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | provenance |  |
+| command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | provenance |  |
+| command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | provenance |  |
+| command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | provenance |  |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | provenance |  |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | provenance |  |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | provenance |  |
 | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | provenance |  |
+| command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | provenance |  |
+| command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | provenance |  |
 | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | provenance |  |
-| command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | provenance |  |
+| command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | provenance |  |
+| command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | provenance |  |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | provenance |  |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | provenance |  |
 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | provenance |  |
 | command-line-parameter-command-injection.js:62:11:62:18 | tainted2 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | provenance |  |
 | command-line-parameter-command-injection.js:65:22:65:31 | taint1rest | command-line-parameter-command-injection.js:65:10:65:31 | "cmd.sh ... nt1rest | provenance |  |
 | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | provenance |  |
-| command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | command-line-parameter-command-injection.js:68:6:68:40 | taint3 | provenance |  |
-| command-line-parameter-command-injection.js:68:6:68:40 | taint3 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | provenance |  |
+| command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | command-line-parameter-command-injection.js:68:10:68:15 | taint3 | provenance |  |
+| command-line-parameter-command-injection.js:68:10:68:15 | taint3 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | provenance |  |
 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | provenance |  |
 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | provenance |  |
-| command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | command-line-parameter-command-injection.js:71:6:71:40 | taint4 | provenance |  |
-| command-line-parameter-command-injection.js:71:6:71:40 | taint4 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | provenance |  |
+| command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | command-line-parameter-command-injection.js:71:10:71:15 | taint4 | provenance |  |
+| command-line-parameter-command-injection.js:71:10:71:15 | taint4 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | provenance |  |
 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | provenance |  |
 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | provenance |  |
-| command-line-parameter-command-injection.js:76:8:76:35 | argv | command-line-parameter-command-injection.js:79:31:79:34 | argv | provenance |  |
+| command-line-parameter-command-injection.js:76:8:76:11 | argv | command-line-parameter-command-injection.js:79:31:79:34 | argv | provenance |  |
 | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | provenance |  |
-| command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | command-line-parameter-command-injection.js:76:8:76:35 | argv | provenance |  |
+| command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | command-line-parameter-command-injection.js:76:8:76:11 | argv | provenance |  |
 | command-line-parameter-command-injection.js:79:22:79:35 | minimist(argv) | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | provenance |  |
 | command-line-parameter-command-injection.js:79:31:79:34 | argv | command-line-parameter-command-injection.js:79:22:79:35 | minimist(argv) | provenance |  |
 | command-line-parameter-command-injection.js:82:22:82:50 | subarg( ... ice(2)) | command-line-parameter-command-injection.js:82:10:82:54 | "cmd.sh ... 2)).foo | provenance |  |
@@ -150,28 +150,28 @@ edges
 | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | command-line-parameter-command-injection.js:85:10:85:59 | "cmd.sh ... 2)).foo | provenance |  |
 | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | provenance |  |
 | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | provenance |  |
-| command-line-parameter-command-injection.js:88:6:88:37 | flags | command-line-parameter-command-injection.js:89:22:89:26 | flags | provenance |  |
-| command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | command-line-parameter-command-injection.js:88:6:88:37 | flags | provenance |  |
+| command-line-parameter-command-injection.js:88:6:88:10 | flags | command-line-parameter-command-injection.js:89:22:89:26 | flags | provenance |  |
+| command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | command-line-parameter-command-injection.js:88:6:88:10 | flags | provenance |  |
 | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | provenance |  |
 | command-line-parameter-command-injection.js:89:22:89:26 | flags | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | provenance |  |
-| command-line-parameter-command-injection.js:91:6:91:38 | flags | command-line-parameter-command-injection.js:92:22:92:26 | flags | provenance |  |
-| command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:91:6:91:38 | flags | provenance |  |
+| command-line-parameter-command-injection.js:91:6:91:10 | flags | command-line-parameter-command-injection.js:92:22:92:26 | flags | provenance |  |
+| command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | command-line-parameter-command-injection.js:91:6:91:10 | flags | provenance |  |
 | command-line-parameter-command-injection.js:92:22:92:26 | flags | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | provenance |  |
 | 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 | provenance |  |
-| command-line-parameter-command-injection.js:107:8:107:51 | options | command-line-parameter-command-injection.js:108:22:108:28 | options | provenance |  |
-| command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:107:8:107:51 | options | provenance |  |
+| command-line-parameter-command-injection.js:107:8:107:14 | options | command-line-parameter-command-injection.js:108:22:108:28 | options | provenance |  |
+| command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | command-line-parameter-command-injection.js:107:8:107:14 | options | provenance |  |
 | command-line-parameter-command-injection.js:108:22:108:28 | options | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | provenance |  |
-| command-line-parameter-command-injection.js:114:8:114:52 | cli | command-line-parameter-command-injection.js:116:22:116:24 | cli | provenance |  |
-| command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:114:8:114:52 | cli | provenance |  |
+| command-line-parameter-command-injection.js:114:8:114:10 | cli | command-line-parameter-command-injection.js:116:22:116:24 | cli | provenance |  |
+| command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | command-line-parameter-command-injection.js:114:8:114:10 | cli | provenance |  |
 | command-line-parameter-command-injection.js:116:22:116:24 | cli | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | provenance |  |
-| command-line-parameter-command-injection.js:122:6:122:46 | opts | command-line-parameter-command-injection.js:124:22:124:25 | opts | provenance |  |
-| command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:122:6:122:46 | opts | provenance |  |
+| command-line-parameter-command-injection.js:122:6:122:9 | opts | command-line-parameter-command-injection.js:124:22:124:25 | opts | provenance |  |
+| command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | command-line-parameter-command-injection.js:122:6:122:9 | opts | provenance |  |
 | command-line-parameter-command-injection.js:124:22:124:25 | opts | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | provenance |  |
-| command-line-parameter-command-injection.js:127:6:127:26 | opts | command-line-parameter-command-injection.js:129:22:129:25 | opts | provenance |  |
-| command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:127:6:127:26 | opts | provenance |  |
+| command-line-parameter-command-injection.js:127:6:127:9 | opts | command-line-parameter-command-injection.js:129:22:129:25 | opts | provenance |  |
+| command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | command-line-parameter-command-injection.js:127:6:127:9 | opts | provenance |  |
 | command-line-parameter-command-injection.js:129:22:129:25 | opts | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | provenance |  |
-| command-line-parameter-command-injection.js:133:8:133:41 | program | command-line-parameter-command-injection.js:137:22:137:28 | program | provenance |  |
-| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:133:8:133:41 | program | provenance |  |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:133:10:133:16 | program | provenance |  |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | command-line-parameter-command-injection.js:137:22:137:28 | program | provenance |  |
 | 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 | provenance |  |
 | 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 | provenance |  |
 | command-line-parameter-command-injection.js:137:22:137:28 | program | command-line-parameter-command-injection.js:137:10:137:38 | "cmd.sh ... zzaType | provenance |  |
@@ -196,8 +196,8 @@ nodes
 | command-line-parameter-command-injection.js:4:10:4:21 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:8:10:8:36 | "cmd.sh ... argv[2] | semmle.label | "cmd.sh ... argv[2] |
 | command-line-parameter-command-injection.js:8:22:8:33 | process.argv | semmle.label | process.argv |
-| command-line-parameter-command-injection.js:10:6:10:33 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:10:6:10:33 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| command-line-parameter-command-injection.js:10:6:10:9 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:10:6:10:9 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:10:13:10:24 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:10:13:10:33 | process ... lice(2) [ArrayElement] | semmle.label | process ... lice(2) [ArrayElement] |
@@ -208,8 +208,8 @@ nodes
 | command-line-parameter-command-injection.js:12:26:12:29 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:12:26:12:29 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:12:26:12:32 | args[0] | semmle.label | args[0] |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs | semmle.label | fewerArgs |
-| command-line-parameter-command-injection.js:14:6:14:30 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs | semmle.label | fewerArgs |
+| command-line-parameter-command-injection.js:14:6:14:14 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:14:18:14:21 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:14:18:14:21 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:14:18:14:30 | args.slice(1) | semmle.label | args.slice(1) |
@@ -221,15 +221,15 @@ nodes
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs | semmle.label | fewerArgs |
 | command-line-parameter-command-injection.js:16:26:16:34 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:16:26:16:37 | fewerArgs[0] | semmle.label | fewerArgs[0] |
-| command-line-parameter-command-injection.js:18:6:18:24 | arg0 | semmle.label | arg0 |
+| command-line-parameter-command-injection.js:18:6:18:9 | arg0 | semmle.label | arg0 |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs | semmle.label | fewerArgs |
 | command-line-parameter-command-injection.js:18:13:18:21 | fewerArgs [ArrayElement] | semmle.label | fewerArgs [ArrayElement] |
 | command-line-parameter-command-injection.js:18:13:18:24 | fewerArgs[0] | semmle.label | fewerArgs[0] |
 | command-line-parameter-command-injection.js:19:14:19:17 | arg0 | semmle.label | arg0 |
 | command-line-parameter-command-injection.js:20:14:20:29 | "cmd.sh " + arg0 | semmle.label | "cmd.sh " + arg0 |
 | command-line-parameter-command-injection.js:20:26:20:29 | arg0 | semmle.label | arg0 |
-| command-line-parameter-command-injection.js:24:8:24:35 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:24:8:24:35 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| command-line-parameter-command-injection.js:24:8:24:11 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:24:8:24:11 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | command-line-parameter-command-injection.js:24:15:24:26 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:24:15:24:35 | process ... lice(2) [ArrayElement] | semmle.label | process ... lice(2) [ArrayElement] |
@@ -247,29 +247,29 @@ nodes
 | command-line-parameter-command-injection.js:32:21:32:41 | require ... ").argv | semmle.label | require ... ").argv |
 | command-line-parameter-command-injection.js:33:9:33:48 | "cmd.sh ... rgv.foo | semmle.label | "cmd.sh ... rgv.foo |
 | command-line-parameter-command-injection.js:33:21:33:44 | require ... ").argv | semmle.label | require ... ").argv |
-| command-line-parameter-command-injection.js:36:6:39:7 | args | semmle.label | args |
+| command-line-parameter-command-injection.js:36:6:36:9 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:36:13:39:7 | require ... \\t\\t.argv | semmle.label | require ... \\t\\t.argv |
 | command-line-parameter-command-injection.js:41:10:41:25 | "cmd.sh " + args | semmle.label | "cmd.sh " + args |
 | command-line-parameter-command-injection.js:41:22:41:25 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:43:10:43:62 | "cmd.sh ... e().foo | semmle.label | "cmd.sh ... e().foo |
 | command-line-parameter-command-injection.js:43:22:43:58 | require ... parse() | semmle.label | require ... parse() |
-| command-line-parameter-command-injection.js:47:8:53:12 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:48:3:50:3 | argv: { ... rgs\\n\\t\\t} | semmle.label | argv: { ... rgs\\n\\t\\t} |
 | command-line-parameter-command-injection.js:48:9:50:3 | {\\n\\t\\t\\t...args\\n\\t\\t} | semmle.label | {\\n\\t\\t\\t...args\\n\\t\\t} |
+| command-line-parameter-command-injection.js:49:7:49:10 | args | semmle.label | args |
 | command-line-parameter-command-injection.js:55:10:55:25 | "cmd.sh " + args | semmle.label | "cmd.sh " + args |
 | command-line-parameter-command-injection.js:55:22:55:25 | args | semmle.label | args |
-| command-line-parameter-command-injection.js:57:6:57:37 | tainted1 | semmle.label | tainted1 |
+| command-line-parameter-command-injection.js:57:6:57:13 | tainted1 | semmle.label | tainted1 |
 | command-line-parameter-command-injection.js:57:17:57:37 | require ... ').argv | semmle.label | require ... ').argv |
-| command-line-parameter-command-injection.js:58:6:58:40 | tainted2 | semmle.label | tainted2 |
+| command-line-parameter-command-injection.js:58:6:58:13 | tainted2 | semmle.label | tainted2 |
 | command-line-parameter-command-injection.js:58:17:58:40 | require ... parse() | semmle.label | require ... parse() |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint1] | semmle.label | {taint1 ... 2rest}} [taint1] |
 | command-line-parameter-command-injection.js:60:8:60:56 | {taint1 ... 2rest}} [taint2] | semmle.label | {taint1 ... 2rest}} [taint2] |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint1rest | semmle.label | taint1rest |
-| command-line-parameter-command-injection.js:60:8:63:2 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:60:9:60:31 | taint1: ... t1rest} | semmle.label | taint1: ... t1rest} |
 | command-line-parameter-command-injection.js:60:17:60:31 | {...taint1rest} | semmle.label | {...taint1rest} |
+| command-line-parameter-command-injection.js:60:21:60:30 | taint1rest | semmle.label | taint1rest |
 | command-line-parameter-command-injection.js:60:33:60:55 | taint2: ... t2rest} | semmle.label | taint2: ... t2rest} |
 | command-line-parameter-command-injection.js:60:41:60:55 | {...taint2rest} | semmle.label | {...taint2rest} |
+| command-line-parameter-command-injection.js:60:45:60:54 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] | semmle.label | {\\n\\t\\ttai ... ted2\\n\\t} [taint1] |
 | command-line-parameter-command-injection.js:60:60:63:2 | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] | semmle.label | {\\n\\t\\ttai ... ted2\\n\\t} [taint2] |
 | command-line-parameter-command-injection.js:61:11:61:18 | tainted1 | semmle.label | tainted1 |
@@ -279,16 +279,16 @@ nodes
 | command-line-parameter-command-injection.js:66:10:66:31 | "cmd.sh ... nt2rest | semmle.label | "cmd.sh ... nt2rest |
 | command-line-parameter-command-injection.js:66:22:66:31 | taint2rest | semmle.label | taint2rest |
 | command-line-parameter-command-injection.js:68:6:68:16 | {...taint3} | semmle.label | {...taint3} |
-| command-line-parameter-command-injection.js:68:6:68:40 | taint3 | semmle.label | taint3 |
+| command-line-parameter-command-injection.js:68:10:68:15 | taint3 | semmle.label | taint3 |
 | command-line-parameter-command-injection.js:68:20:68:40 | require ... ').argv | semmle.label | require ... ').argv |
 | command-line-parameter-command-injection.js:69:10:69:27 | "cmd.sh " + taint3 | semmle.label | "cmd.sh " + taint3 |
 | command-line-parameter-command-injection.js:69:22:69:27 | taint3 | semmle.label | taint3 |
 | command-line-parameter-command-injection.js:71:6:71:16 | [...taint4] | semmle.label | [...taint4] |
-| command-line-parameter-command-injection.js:71:6:71:40 | taint4 | semmle.label | taint4 |
+| command-line-parameter-command-injection.js:71:10:71:15 | taint4 | semmle.label | taint4 |
 | command-line-parameter-command-injection.js:71:20:71:40 | require ... ').argv | semmle.label | require ... ').argv |
 | command-line-parameter-command-injection.js:72:10:72:27 | "cmd.sh " + taint4 | semmle.label | "cmd.sh " + taint4 |
 | command-line-parameter-command-injection.js:72:22:72:27 | taint4 | semmle.label | taint4 |
-| command-line-parameter-command-injection.js:76:8:76:35 | argv | semmle.label | argv |
+| command-line-parameter-command-injection.js:76:8:76:11 | argv | semmle.label | argv |
 | command-line-parameter-command-injection.js:76:15:76:26 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:76:15:76:35 | process ... lice(2) | semmle.label | process ... lice(2) |
 | command-line-parameter-command-injection.js:79:10:79:39 | "cmd.sh ... gv).foo | semmle.label | "cmd.sh ... gv).foo |
@@ -302,34 +302,34 @@ nodes
 | command-line-parameter-command-injection.js:85:22:85:55 | yargsPa ... ice(2)) | semmle.label | yargsPa ... ice(2)) |
 | command-line-parameter-command-injection.js:85:34:85:45 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:85:34:85:54 | process ... lice(2) | semmle.label | process ... lice(2) |
-| command-line-parameter-command-injection.js:88:6:88:37 | flags | semmle.label | flags |
+| command-line-parameter-command-injection.js:88:6:88:10 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:88:14:88:37 | args.pa ... s.argv) | semmle.label | args.pa ... s.argv) |
 | command-line-parameter-command-injection.js:88:25:88:36 | process.argv | semmle.label | process.argv |
 | command-line-parameter-command-injection.js:89:10:89:30 | "cmd.sh ... ags.foo | semmle.label | "cmd.sh ... ags.foo |
 | command-line-parameter-command-injection.js:89:22:89:26 | flags | semmle.label | flags |
-| command-line-parameter-command-injection.js:91:6:91:38 | flags | semmle.label | flags |
+| command-line-parameter-command-injection.js:91:6:91:10 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:91:14:91:38 | require ... .spec}) | semmle.label | require ... .spec}) |
 | command-line-parameter-command-injection.js:92:10:92:30 | "cmd.sh ... ags.foo | semmle.label | "cmd.sh ... ags.foo |
 | command-line-parameter-command-injection.js:92:22:92:26 | flags | semmle.label | flags |
 | command-line-parameter-command-injection.js:102:10:102:44 | "cmd.sh ... s().foo | semmle.label | "cmd.sh ... s().foo |
 | command-line-parameter-command-injection.js:102:22:102:40 | parser.parse_args() | semmle.label | parser.parse_args() |
-| command-line-parameter-command-injection.js:107:8:107:51 | options | semmle.label | options |
+| command-line-parameter-command-injection.js:107:8:107:14 | options | semmle.label | options |
 | command-line-parameter-command-injection.js:107:18:107:51 | command ... itions) | semmle.label | command ... itions) |
 | command-line-parameter-command-injection.js:108:10:108:32 | "cmd.sh ... ons.foo | semmle.label | "cmd.sh ... ons.foo |
 | command-line-parameter-command-injection.js:108:22:108:28 | options | semmle.label | options |
-| command-line-parameter-command-injection.js:114:8:114:52 | cli | semmle.label | cli |
+| command-line-parameter-command-injection.js:114:8:114:10 | cli | semmle.label | cli |
 | command-line-parameter-command-injection.js:114:14:114:52 | meow(`h ... lags}}) | semmle.label | meow(`h ... lags}}) |
 | command-line-parameter-command-injection.js:116:10:116:33 | "cmd.sh ... nput[0] | semmle.label | "cmd.sh ... nput[0] |
 | command-line-parameter-command-injection.js:116:22:116:24 | cli | semmle.label | cli |
-| command-line-parameter-command-injection.js:122:6:122:46 | opts | semmle.label | opts |
+| command-line-parameter-command-injection.js:122:6:122:9 | opts | semmle.label | opts |
 | command-line-parameter-command-injection.js:122:13:122:46 | dashdas ... tions}) | semmle.label | dashdas ... tions}) |
 | command-line-parameter-command-injection.js:124:10:124:29 | "cmd.sh " + opts.foo | semmle.label | "cmd.sh " + opts.foo |
 | command-line-parameter-command-injection.js:124:22:124:25 | opts | semmle.label | opts |
-| command-line-parameter-command-injection.js:127:6:127:26 | opts | semmle.label | opts |
+| command-line-parameter-command-injection.js:127:6:127:9 | opts | semmle.label | opts |
 | command-line-parameter-command-injection.js:127:13:127:26 | parser.parse() | semmle.label | parser.parse() |
 | command-line-parameter-command-injection.js:129:10:129:29 | "cmd.sh " + opts.foo | semmle.label | "cmd.sh " + opts.foo |
 | command-line-parameter-command-injection.js:129:22:129:25 | opts | semmle.label | opts |
-| command-line-parameter-command-injection.js:133:8:133:41 | program | semmle.label | program |
+| command-line-parameter-command-injection.js:133:10:133:16 | program | semmle.label | program |
 | command-line-parameter-command-injection.js:133:10:133:16 | program | semmle.label | program |
 | command-line-parameter-command-injection.js:136:10:136:45 | "cmd.sh ... zzaType | semmle.label | "cmd.sh ... zzaType |
 | command-line-parameter-command-injection.js:136:22:136:35 | program.opts() | semmle.label | program.opts() |
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 e4396669dc85..85d629191c5a 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
@@ -9,20 +9,20 @@
 | 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 |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:7:33:7:38 | remote | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:9:29:9:34 | remote | provenance |  |
+| second-order.js:6:9:6:14 | remote | second-order.js:11:33:11:38 | remote | provenance |  |
+| second-order.js:6:9:6:14 | 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:14 | remote | provenance |  |
+| second-order.js:13:9:13:14 | 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:14 | myArgs | provenance |  |
 nodes
-| second-order.js:6:9:6:33 | remote | semmle.label | remote |
+| second-order.js:6:9:6:14 | remote | semmle.label | remote |
 | second-order.js:6:18:6:33 | req.query.remote | semmle.label | req.query.remote |
 | second-order.js:7:33:7:38 | remote | semmle.label | remote |
 | second-order.js:9:29:9:34 | remote | semmle.label | remote |
 | second-order.js:11:33:11:38 | remote | semmle.label | remote |
-| second-order.js:13:9:13:31 | myArgs | semmle.label | myArgs |
+| second-order.js:13:9:13:14 | myArgs | semmle.label | myArgs |
 | second-order.js:13:18:13:31 | req.query.args | semmle.label | req.query.args |
 | second-order.js:15:19:15:24 | myArgs | semmle.label | myArgs |
 | second-order.js:26:35:26:40 | remote | semmle.label | remote |
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 c4b16b01a38f..564d9ca221e7 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
@@ -142,10 +142,10 @@ edges
 | lib/lib.js:155:38:155:41 | name | lib/lib.js:161:25:161:28 | name | provenance |  |
 | lib/lib.js:170:41:170:44 | name | lib/lib.js:173:20:173:23 | name | provenance |  |
 | lib/lib.js:177:38:177:41 | name | lib/lib.js:181:21:181:24 | name | provenance |  |
-| lib/lib.js:181:6:181:52 | broken | lib/lib.js:182:22:182:27 | broken | provenance |  |
+| lib/lib.js:181:6:181:11 | broken | lib/lib.js:182:22:182:27 | broken | provenance |  |
 | lib/lib.js:181:21:181:24 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | provenance |  |
 | lib/lib.js:181:21:181:24 | name | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | provenance |  |
-| lib/lib.js:181:21:181:46 | name.re ... "'\\''") | lib/lib.js:181:6:181:52 | broken | provenance |  |
+| lib/lib.js:181:21:181:46 | name.re ... "'\\''") | lib/lib.js:181:6:181:11 | broken | provenance |  |
 | lib/lib.js:186:34:186:37 | name | lib/lib.js:187:22:187:25 | name | provenance |  |
 | lib/lib.js:186:34:186:37 | name | lib/lib.js:190:23:190:26 | name | provenance |  |
 | lib/lib.js:196:45:196:48 | name | lib/lib.js:197:22:197:25 | name | provenance |  |
@@ -160,8 +160,8 @@ edges
 | lib/lib.js:239:28:239:28 | s | lib/lib.js:245:9:245:9 | s | provenance |  |
 | lib/lib.js:248:42:248:45 | name | lib/lib.js:249:22:249:25 | name | provenance |  |
 | lib/lib.js:248:42:248:45 | name | lib/lib.js:251:27:251:30 | name | provenance |  |
-| lib/lib.js:251:6:251:31 | cleaned | lib/lib.js:253:22:253:28 | cleaned | provenance |  |
-| lib/lib.js:251:16:251:31 | cleanInput(name) | lib/lib.js:251:6:251:31 | cleaned | provenance |  |
+| lib/lib.js:251:6:251:12 | cleaned | lib/lib.js:253:22:253:28 | cleaned | provenance |  |
+| lib/lib.js:251:16:251:31 | cleanInput(name) | lib/lib.js:251:6:251:12 | cleaned | provenance |  |
 | lib/lib.js:251:27:251:30 | name | lib/lib.js:239:28:239:28 | s | provenance |  |
 | lib/lib.js:251:27:251:30 | name | lib/lib.js:251:16:251:31 | cleanInput(name) | provenance |  |
 | lib/lib.js:257:35:257:38 | name | lib/lib.js:258:22:258:25 | name | provenance |  |
@@ -235,10 +235,10 @@ edges
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:626:29:626:32 | name | provenance |  |
 | lib/lib.js:608:42:608:45 | name | lib/lib.js:629:25:629:28 | name | provenance |  |
 | lib/lib.js:632:38:632:41 | name | lib/lib.js:633:24:633:27 | name | provenance |  |
-| lib/lib.js:633:6:633:68 | sanitized | lib/lib.js:634:22:634:30 | sanitized | provenance |  |
+| lib/lib.js:633:6:633:14 | sanitized | lib/lib.js:634:22:634:30 | sanitized | provenance |  |
 | lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | provenance |  |
 | lib/lib.js:633:24:633:27 | name | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | provenance |  |
-| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | lib/lib.js:633:6:633:68 | sanitized | provenance |  |
+| lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | lib/lib.js:633:6:633:14 | sanitized | provenance |  |
 | lib/subLib2/compiled-file.ts:3:26:3:29 | name | lib/subLib2/compiled-file.ts:4:25:4:28 | name | provenance |  |
 | lib/subLib2/special-file.js:3:28:3:31 | name | lib/subLib2/special-file.js:4:22:4:25 | name | provenance |  |
 | lib/subLib3/my-file.ts:3:28:3:31 | name | lib/subLib3/my-file.ts:4:22:4:25 | name | provenance |  |
@@ -308,7 +308,7 @@ nodes
 | lib/lib.js:170:41:170:44 | name | semmle.label | name |
 | lib/lib.js:173:20:173:23 | name | semmle.label | name |
 | lib/lib.js:177:38:177:41 | name | semmle.label | name |
-| lib/lib.js:181:6:181:52 | broken | semmle.label | broken |
+| lib/lib.js:181:6:181:11 | broken | semmle.label | broken |
 | lib/lib.js:181:21:181:24 | name | semmle.label | name |
 | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | semmle.label | name.re ... "'\\''") |
 | lib/lib.js:181:21:181:46 | name.re ... "'\\''") | semmle.label | name.re ... "'\\''") |
@@ -333,7 +333,7 @@ nodes
 | lib/lib.js:245:9:245:9 | s | semmle.label | s |
 | lib/lib.js:248:42:248:45 | name | semmle.label | name |
 | lib/lib.js:249:22:249:25 | name | semmle.label | name |
-| lib/lib.js:251:6:251:31 | cleaned | semmle.label | cleaned |
+| lib/lib.js:251:6:251:12 | cleaned | semmle.label | cleaned |
 | lib/lib.js:251:16:251:31 | cleanInput(name) | semmle.label | cleanInput(name) |
 | lib/lib.js:251:27:251:30 | name | semmle.label | name |
 | lib/lib.js:253:22:253:28 | cleaned | semmle.label | cleaned |
@@ -428,7 +428,7 @@ nodes
 | lib/lib.js:626:29:626:32 | name | semmle.label | name |
 | lib/lib.js:629:25:629:28 | name | semmle.label | name |
 | lib/lib.js:632:38:632:41 | name | semmle.label | name |
-| lib/lib.js:633:6:633:68 | sanitized | semmle.label | sanitized |
+| lib/lib.js:633:6:633:14 | sanitized | semmle.label | sanitized |
 | lib/lib.js:633:24:633:27 | name | semmle.label | name |
 | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | semmle.label | name.re ... '\\\\''") |
 | lib/lib.js:633:24:633:62 | name.re ... '\\\\''") | semmle.label | name.re ... '\\\\''") |
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 0f5659492116..fce55fec2936 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
@@ -244,8 +244,8 @@
 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 |  |
-| addEventListener.js:5:43:5:48 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
-| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:43:5:48 | data | provenance |  |
+| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:44:5:47 | data | provenance |  |
+| addEventListener.js:5:44:5:47 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
 | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:28 | event | provenance |  |
 | addEventListener.js:12:24:12:28 | event | addEventListener.js:12:24:12:33 | event.data | provenance |  |
 | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | provenance |  |
@@ -270,25 +270,25 @@ edges
 | classnames.js:15:52:15:62 | window.name | classnames.js:15:47:15:63 | clsx(window.name) | provenance |  |
 | classnames.js:17:48:17:64 | clsx(window.name) | classnames.js:17:32:17:79 | `<span  ... <span>` | provenance |  |
 | classnames.js:17:53:17:63 | window.name | classnames.js:17:48:17:64 | clsx(window.name) | provenance |  |
-| clipboard.ts:8:11:8:51 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
-| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:51 | html | provenance |  |
-| clipboard.ts:43:15:43:55 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
-| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:55 | html | provenance |  |
-| clipboard.ts:71:13:71:62 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
-| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:62 | droppedHtml | provenance |  |
-| clipboard.ts:98:15:98:54 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
-| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:54 | html | provenance |  |
+| clipboard.ts:8:11:8:14 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
+| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:14 | html | provenance |  |
+| clipboard.ts:43:15:43:18 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
+| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:18 | html | provenance |  |
+| clipboard.ts:71:13:71:23 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
+| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:23 | droppedHtml | provenance |  |
+| clipboard.ts:98:15:98:18 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
+| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:18 | html | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:11:63:11:67 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:12:66:12:70 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:13:59:13:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:16:62:16:66 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:18:59:18:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:21:61:21:65 | taint | provenance |  |
-| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:69 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:11:63:11:67 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:12:66:12:70 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:13:59:13:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:16:62:16:66 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:18:59:18:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:21:61:21:65 | taint | provenance |  |
+| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:13 | taint | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance | Config |
 | dates.js:9:36:9:68 | window. ... ring(1) | dates.js:9:17:9:69 | decodeU ... ing(1)) | provenance |  |
@@ -304,11 +304,11 @@ edges
 | dates.js:18:59:18:63 | taint | dates.js:18:42:18:64 | datefor ...  taint) | provenance |  |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | dates.js:21:31:21:68 | `Time i ... aint)}` | provenance |  |
 | dates.js:21:61:21:65 | taint | dates.js:21:42:21:66 | dayjs(t ... (taint) | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:37:77:37:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:38:77:38:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:39:79:39:83 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:40:77:40:81 | taint | provenance |  |
-| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:69 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:37:77:37:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:38:77:38:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:39:79:39:83 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:40:77:40:81 | taint | provenance |  |
+| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:13 | taint | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance | Config |
 | dates.js:30:36:30:68 | window. ... ring(1) | dates.js:30:17:30:69 | decodeU ... ing(1)) | provenance |  |
@@ -320,10 +320,10 @@ edges
 | dates.js:39:79:39:83 | taint | dates.js:39:42:39:84 | moment. ...  taint) | provenance |  |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | dates.js:40:31:40:84 | `Time i ... aint)}` | provenance |  |
 | dates.js:40:77:40:81 | taint | dates.js:40:42:40:82 | dayjs.f ...  taint) | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:48:83:48:87 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:49:82:49:86 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:50:97:50:101 | taint | provenance |  |
-| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:69 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:48:83:48:87 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:49:82:49:86 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:50:97:50:101 | taint | provenance |  |
+| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:13 | taint | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance | Config |
 | dates.js:46:36:46:68 | window. ... ring(1) | dates.js:46:17:46:69 | decodeU ... ing(1)) | provenance |  |
@@ -333,10 +333,10 @@ edges
 | dates.js:49:82:49:86 | taint | dates.js:49:42:49:87 | new Dat ... (taint) | provenance |  |
 | dates.js:50:42:50:102 | DateTim ... (taint) | dates.js:50:31:50:104 | `Time i ... aint)}` | provenance |  |
 | dates.js:50:97:50:101 | taint | dates.js:50:42:50:102 | DateTim ... (taint) | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:57:94:57:98 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:59:80:59:84 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:61:81:61:85 | taint | provenance |  |
-| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:69 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:57:94:57:98 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:59:80:59:84 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:61:81:61:85 | taint | provenance |  |
+| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:13 | taint | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance | Config |
 | dates.js:54:36:54:68 | window. ... ring(1) | dates.js:54:17:54:69 | decodeU ... ing(1)) | provenance |  |
@@ -346,21 +346,21 @@ edges
 | dates.js:59:80:59:84 | taint | dates.js:59:42:59:85 | luxon.e ... (taint) | provenance |  |
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | dates.js:61:31:61:88 | `Time i ... aint)}` | provenance |  |
 | dates.js:61:81:61:85 | taint | dates.js:61:42:61:86 | dayjs.s ... (taint) | provenance |  |
-| dragAndDrop.ts:8:11:8:50 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
-| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:50 | html | provenance |  |
-| dragAndDrop.ts:43:15:43:54 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
-| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:54 | html | provenance |  |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
-| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:61 | droppedHtml | provenance |  |
+| dragAndDrop.ts:8:11:8:14 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
+| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:14 | html | provenance |  |
+| dragAndDrop.ts:43:15:43:18 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
+| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:18 | html | provenance |  |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
+| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:23 | 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 |
-| 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 |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
-| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:40 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
+| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:13 | tainted | provenance |  |
 | jquery.js:4:5:4:11 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
 | jquery.js:5:13:5:19 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
 | jquery.js:6:11:6:17 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
@@ -374,13 +374,13 @@ edges
 | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | provenance |  |
 | jquery.js:16:38:16:52 | window.location | jquery.js:16:38:16:63 | window. ... tring() | provenance |  |
 | jquery.js:16:38:16:63 | window. ... tring() | jquery.js:16:19:16:64 | decodeU ... ring()) | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
-| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:33 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
+| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:10 | hash | provenance |  |
 | jquery.js:21:5:21:8 | hash | jquery.js:21:5:21:21 | hash.substring(1) | provenance | Config |
 | jquery.js:22:5:22:8 | hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | provenance | Config |
 | jquery.js:23:5:23:8 | hash | jquery.js:23:5:23:18 | hash.substr(1) | provenance | Config |
@@ -390,47 +390,47 @@ edges
 | jquery.js:34:13:34:16 | hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | provenance | Config |
 | jquery.js:36:25:36:31 | tainted | jquery.js:37:31:37:37 | tainted | provenance |  |
 | jquery.js:37:31:37:37 | tainted | jquery.js:37:25:37:37 | () => tainted | provenance | Config |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
-| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:36 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
+| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:14 | locale | provenance |  |
 | json-stringify.jsx:11:51:11:56 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:19:56:19:61 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:31:55:31:60 | locale | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | provenance |  |
-| 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:7:9:7:13 | 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:13 | 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: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 |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
-| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:39 | target | provenance |  |
-| optionalSanitizer.js:8:7:8:22 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
-| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:22 | tainted | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
+| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:12 | target | provenance |  |
+| optionalSanitizer.js:8:7:8:13 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
+| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:13 | tainted | provenance |  |
 | optionalSanitizer.js:15:9:15:14 | target | optionalSanitizer.js:16:18:16:18 | x | provenance |  |
 | optionalSanitizer.js:16:18:16:18 | x | optionalSanitizer.js:17:20:17:20 | x | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
-| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:39 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
+| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:12 | target | provenance |  |
 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:23 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:36 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:14 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:12 | tainted2 | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:23 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:36 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:14 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:12 | tainted3 | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | provenance |  |
 | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
@@ -439,8 +439,8 @@ edges
 | optionalSanitizer.js:45:51:45:56 | target | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [id] | pages/[id].jsx:13:44:13:49 | params [id] | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [q] | pages/[id].jsx:16:44:16:49 | params [q] | provenance |  |
-| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:9:5:29 | id | provenance |  |
-| pages/[id].jsx:5:9:5:29 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
+| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:11:5:12 | id | provenance |  |
+| pages/[id].jsx:5:11:5:12 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
 | 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 |  |
@@ -450,30 +450,30 @@ edges
 | 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      ... 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 |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | 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:13 | tainted | provenance |  |
 | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | provenance |  |
 | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | provenance |  |
 | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | provenance |  |
 | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | provenance |  |
-| react-use-state.js:4:9:4:49 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
-| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:9:4:49 | state | provenance |  |
-| react-use-state.js:9:9:9:43 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
-| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:9:9:43 | state | provenance |  |
-| react-use-state.js:15:9:15:43 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
-| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:9:15:43 | state | provenance |  |
+| react-use-state.js:4:10:4:14 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
+| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:10:4:14 | state | provenance |  |
+| react-use-state.js:9:10:9:14 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
+| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:10:9:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:10:15:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
 | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:15:10:15:14 | state | provenance |  |
 | react-use-state.js:21:10:21:14 | state | react-use-state.js:22:14:22:17 | prev | provenance |  |
 | react-use-state.js:22:14:22:17 | prev | react-use-state.js:23:35:23:38 | prev | provenance |  |
 | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:21:10:21:14 | state | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
-| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:27 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
+| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:13 | tainted | provenance |  |
 | sanitiser.js:23:29:23:35 | tainted | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:30:29:30:35 | tainted | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:33:29:33:35 | tainted | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | provenance |  |
@@ -483,8 +483,8 @@ edges
 | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:10:16:10:44 | localSt ... local') | provenance |  |
-| stored-xss.js:10:9:10:44 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
-| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:44 | href | provenance |  |
+| stored-xss.js:10:9:10:12 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
+| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:12 | href | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance | Config |
 | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | provenance |  |
@@ -494,24 +494,24 @@ edges
 | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | provenance |  |
 | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | provenance |  |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | tainted-url-suffix-arguments.js:6:22:6:22 | y | provenance |  |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
-| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:36 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:13 | url | provenance |  |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | tainted-url-suffix-arguments.js:3:17:3:17 | y | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
-| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:30 | source | provenance |  |
-| tooltip.jsx:17:11:17:33 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
-| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:33 | provide [source] | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
+| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:16 | source | provenance |  |
+| tooltip.jsx:17:11:17:17 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
+| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:17 | provide [source] | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:18:51:18:59 | provide() | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | provenance |  |
-| tooltip.jsx:22:11:22:30 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
-| 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: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 |  |
+| tooltip.jsx:22:11:22:16 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
+| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:16 | source | provenance |  |
+| translate.js:6:7:6:12 | target | translate.js:7:42:7:47 | target | provenance |  |
+| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:12 | target | provenance |  |
+| translate.js:7:7:7:18 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:18 | 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:18 | searchParams | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:18 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
@@ -538,32 +538,32 @@ 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: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:2:7:2:12 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:17:42:17:47 | target | provenance |  |
+| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:12 | 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:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:12 | 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:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | 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:7:17:18 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:18 | 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:18 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:18 | 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 |
@@ -613,31 +613,31 @@ edges
 | 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:7:93:7 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:7 | 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:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:7 | 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:161:9:161:14 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:14 | target | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:15 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:15 | 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 |  |
@@ -658,8 +658,8 @@ edges
 | 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:269:9:269:15 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:15 | 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 |  |
@@ -668,34 +668,34 @@ edges
 | 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:7:315:12 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:12 | 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:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:12 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:12 | 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:332:7:332:12 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:12 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:15 | 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:355:7:355:12 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:12 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:12 | 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 |  |
@@ -708,64 +708,64 @@ edges
 | 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:7:399:13 | 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:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:13 | payload | provenance |  |
+| tst.js:402:7:402:11 | 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:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:11 | 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:411:7:411:12 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:12 | 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:419:6:419:11 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:11 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:12 | 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:443:6:443:11 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:11 | source | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:9 | 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:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:9 | 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:491:7:491:12 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:12 | 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:498:7:498:12 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:12 | 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:20:13:20:18 | target | typeahead.js:21:12:21:17 | target | provenance |  |
+| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:18 | 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 |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:39 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:12 | tainted | provenance |  |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | provenance | Config |
 | various-concat-obfuscations.js:5:12:5:18 | tainted | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | provenance | Config |
 | various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | provenance |  |
@@ -795,17 +795,17 @@ edges
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | provenance | Config |
-| winjs.js:2:7:2:53 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
-| winjs.js:2:7:2:53 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
 | 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 |  |
+| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:13 | 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:5:44:5:47 | 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 |
@@ -855,19 +855,19 @@ nodes
 | 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:11:8:14 | 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:15:43:18 | 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:13:71:23 | 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:15:98:18 | 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 |
@@ -876,7 +876,7 @@ nodes
 | 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:9:9:13 | 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) |
@@ -898,7 +898,7 @@ nodes
 | 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:9:30:13 | 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) |
@@ -914,7 +914,7 @@ nodes
 | 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:9:46:13 | 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) |
@@ -927,7 +927,7 @@ nodes
 | 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:9:54:13 | 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) |
@@ -941,16 +941,16 @@ nodes
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
 | dates.js:61:81:61:85 | taint | semmle.label | taint |
 | dom.js:4:20:4:30 | window.name | semmle.label | window.name |
-| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
+| dragAndDrop.ts:8:11:8:14 | 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:15:43:18 | 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:13:71:23 | 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>' |
@@ -958,7 +958,7 @@ nodes
 | express.js:6:15:6:33 | req.param("wobble") | semmle.label | req.param("wobble") |
 | jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
-| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
+| jquery.js:2:7:2:13 | 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 |
@@ -977,7 +977,7 @@ nodes
 | 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:7:18:10 | 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) |
@@ -996,14 +996,14 @@ nodes
 | 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:9:5:14 | 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:9:7:13 | 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 |
@@ -1011,30 +1011,30 @@ nodes
 | 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:7:2:12 | 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:7:8:13 | 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:7:26:12 | 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:7:31:14 | 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:5:34:12 | 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:7:38:14 | 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:5:41:12 | 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 |
@@ -1045,7 +1045,7 @@ nodes
 | 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:11:5:12 | 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] |
@@ -1058,7 +1058,7 @@ nodes
 | 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:7:7:13 | 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 |
@@ -1072,13 +1072,13 @@ nodes
 | 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:10:4:14 | 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:9:10:9:14 | 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: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 |
@@ -1086,7 +1086,7 @@ nodes
 | 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:7:16:13 | 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 |
@@ -1104,7 +1104,7 @@ nodes
 | 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:9:10:12 | 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 |
@@ -1124,24 +1124,24 @@ nodes
 | 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:11:11:13 | 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:11:6:16 | 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:11:17:17 | 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:11:22:16 | 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:7:6:12 | 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:7:7:18 | searchParams | semmle.label | searchParams |
+| translate.js:7:7:7:18 | 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 |
@@ -1171,7 +1171,7 @@ nodes
 | 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:7:2:12 | 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>" |
@@ -1180,8 +1180,8 @@ nodes
 | 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:7:14:12 | params | semmle.label | params |
+| tst.js:14:7:14:12 | 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 |
@@ -1192,8 +1192,8 @@ nodes
 | 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:7:17:18 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:18 | 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 |
@@ -1249,7 +1249,7 @@ nodes
 | 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:7:93:7 | 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 |
@@ -1259,10 +1259,10 @@ nodes
 | 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:9:161:14 | 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:9:168:15 | 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 |
@@ -1270,7 +1270,7 @@ nodes
 | 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:9:181:15 | 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 |
@@ -1297,7 +1297,7 @@ nodes
 | 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:9:269:15 | 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 |
@@ -1310,8 +1310,8 @@ nodes
 | 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:7:315:12 | params | semmle.label | params |
+| tst.js:315:7:315:12 | 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 |
@@ -1324,19 +1324,19 @@ nodes
 | 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:7:332:12 | 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:10:339:15 | 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:7:355:12 | 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:7:364:12 | 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 |
@@ -1355,11 +1355,11 @@ nodes
 | 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:7:399:13 | 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:7:402:11 | 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 |
@@ -1367,11 +1367,11 @@ nodes
 | 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:7:411:12 | 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:6:419:11 | 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 |
@@ -1379,17 +1379,17 @@ nodes
 | 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:7:436:12 | 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:6:443:11 | 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:7:454:9 | 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 |
@@ -1403,22 +1403,22 @@ nodes
 | 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:7:491:12 | 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:7:498:12 | 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:13:20:18 | 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:6:2:12 | 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 |
@@ -1458,7 +1458,7 @@ nodes
 | 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:7:2:13 | 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 |
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 c031b7c1810c..4f27cd94835c 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
@@ -2,8 +2,8 @@ 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:5:44:5:47 | 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 |
@@ -53,19 +53,19 @@ nodes
 | 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:11:8:14 | 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:15:43:18 | 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:13:71:23 | 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:15:98:18 | 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 |
@@ -74,7 +74,7 @@ nodes
 | 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:9:9:13 | 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) |
@@ -96,7 +96,7 @@ nodes
 | 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:9:30:13 | 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) |
@@ -112,7 +112,7 @@ nodes
 | 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:9:46:13 | 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) |
@@ -125,7 +125,7 @@ nodes
 | 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:9:54:13 | 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) |
@@ -139,16 +139,16 @@ nodes
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | semmle.label | dayjs.s ... (taint) |
 | dates.js:61:81:61:85 | taint | semmle.label | taint |
 | dom.js:4:20:4:30 | window.name | semmle.label | window.name |
-| dragAndDrop.ts:8:11:8:50 | html | semmle.label | html |
+| dragAndDrop.ts:8:11:8:14 | 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:15:43:18 | 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:13:71:23 | 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>' |
@@ -184,7 +184,7 @@ nodes
 | hana.js:90:33:90:45 | rs[0].comment | semmle.label | rs[0].comment |
 | jquery-declare-any.ts:6:7:6:17 | window.name | semmle.label | window.name |
 | jquery-declare-type.ts:6:7:6:17 | window.name | semmle.label | window.name |
-| jquery.js:2:7:2:40 | tainted | semmle.label | tainted |
+| jquery.js:2:7:2:13 | 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 |
@@ -203,7 +203,7 @@ nodes
 | 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:7:18:10 | 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) |
@@ -222,50 +222,50 @@ nodes
 | 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:9:5:14 | 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:9:7:13 | 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 |
 | jwt.js:4:36:4:39 | data | semmle.label | data |
-| jwt.js:5:9:5:34 | decoded | semmle.label | decoded |
+| jwt.js:5:9:5:15 | decoded | semmle.label | decoded |
 | jwt.js:5:19:5:34 | jwt_decode(data) | semmle.label | jwt_decode(data) |
 | jwt.js:5:30:5:33 | data | semmle.label | data |
 | jwt.js:6:14:6:20 | decoded | semmle.label | decoded |
 | 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:7:2:12 | 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:7:8:13 | 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:7:26:12 | 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:7:31:14 | 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:5:34:12 | 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:7:38:14 | 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:5:41:12 | 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 |
@@ -276,7 +276,7 @@ nodes
 | 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:11:5:12 | 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] |
@@ -289,7 +289,7 @@ nodes
 | 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:7:7:13 | 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 |
@@ -303,13 +303,13 @@ nodes
 | 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:10:4:14 | 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:9:10:9:14 | 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: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 |
@@ -317,7 +317,7 @@ nodes
 | 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:7:16:13 | 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 |
@@ -335,7 +335,7 @@ nodes
 | 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:9:10:12 | 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 |
@@ -355,24 +355,24 @@ nodes
 | 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:11:11:13 | 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:11:6:16 | 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:11:17:17 | 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:11:22:16 | 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:7:6:12 | 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:7:7:18 | searchParams | semmle.label | searchParams |
+| translate.js:7:7:7:18 | 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 |
@@ -402,7 +402,7 @@ nodes
 | 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:7:2:12 | 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>" |
@@ -411,8 +411,8 @@ nodes
 | 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:7:14:12 | params | semmle.label | params |
+| tst.js:14:7:14:12 | 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 |
@@ -423,8 +423,8 @@ nodes
 | 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:7:17:18 | searchParams | semmle.label | searchParams |
+| tst.js:17:7:17:18 | 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 |
@@ -480,7 +480,7 @@ nodes
 | 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:7:93:7 | 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 |
@@ -490,10 +490,10 @@ nodes
 | 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:9:161:14 | 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:9:168:15 | 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 |
@@ -501,7 +501,7 @@ nodes
 | 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:9:181:15 | 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 |
@@ -528,7 +528,7 @@ nodes
 | 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:9:269:15 | 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 |
@@ -541,8 +541,8 @@ nodes
 | 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:7:315:12 | params | semmle.label | params |
+| tst.js:315:7:315:12 | 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 |
@@ -555,19 +555,19 @@ nodes
 | 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:7:332:12 | 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:10:339:15 | 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:7:355:12 | 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:7:364:12 | 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 |
@@ -586,11 +586,11 @@ nodes
 | 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:7:399:13 | 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:7:402:11 | 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 |
@@ -598,11 +598,11 @@ nodes
 | 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:7:411:12 | 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:6:419:11 | 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 |
@@ -610,17 +610,17 @@ nodes
 | 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:7:436:12 | 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:6:443:11 | 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:7:454:9 | 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 |
@@ -634,24 +634,24 @@ nodes
 | 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:7:491:12 | 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:7:498:12 | 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 |
+| typeahead.js:20:13:20:18 | 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:6:2:12 | 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 |
@@ -691,20 +691,20 @@ nodes
 | 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:7:2:13 | 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 |
-| xmlRequest.js:8:13:8:47 | json | semmle.label | json |
+| xmlRequest.js:8:13:8:16 | json | semmle.label | json |
 | xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | semmle.label | JSON.pa ... seText) |
 | xmlRequest.js:8:31:8:46 | xhr.responseText | semmle.label | xhr.responseText |
 | xmlRequest.js:9:28:9:31 | json | semmle.label | json |
 | xmlRequest.js:9:28:9:39 | json.message | semmle.label | json.message |
-| xmlRequest.js:20:11:20:48 | resp | semmle.label | resp |
+| xmlRequest.js:20:11:20:14 | resp | semmle.label | resp |
 | xmlRequest.js:20:18:20:48 | await g ... rl }}") | semmle.label | await g ... rl }}") |
 | xmlRequest.js:20:24:20:48 | got.get ... rl }}") | semmle.label | got.get ... rl }}") |
-| xmlRequest.js:21:11:21:38 | json | semmle.label | json |
+| xmlRequest.js:21:11:21:14 | json | semmle.label | json |
 | xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | semmle.label | JSON.pa ... p.body) |
 | xmlRequest.js:21:29:21:32 | resp | semmle.label | resp |
 | xmlRequest.js:22:24:22:27 | json | semmle.label | json |
@@ -712,8 +712,8 @@ nodes
 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 |  |
-| addEventListener.js:5:43:5:48 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
-| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:43:5:48 | data | provenance |  |
+| addEventListener.js:5:43:5:48 | {data} | addEventListener.js:5:44:5:47 | data | provenance |  |
+| addEventListener.js:5:44:5:47 | data | addEventListener.js:6:20:6:23 | data | provenance |  |
 | addEventListener.js:10:21:10:25 | event | addEventListener.js:12:24:12:28 | event | provenance |  |
 | addEventListener.js:12:24:12:28 | event | addEventListener.js:12:24:12:33 | event.data | provenance |  |
 | angular2-client.ts:26:44:26:69 | this.ro ... .params | angular2-client.ts:26:44:26:73 | this.ro ... ams.foo | provenance |  |
@@ -738,25 +738,25 @@ edges
 | classnames.js:15:52:15:62 | window.name | classnames.js:15:47:15:63 | clsx(window.name) | provenance |  |
 | classnames.js:17:48:17:64 | clsx(window.name) | classnames.js:17:32:17:79 | `<span  ... <span>` | provenance |  |
 | classnames.js:17:53:17:63 | window.name | classnames.js:17:48:17:64 | clsx(window.name) | provenance |  |
-| clipboard.ts:8:11:8:51 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
-| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:51 | html | provenance |  |
-| clipboard.ts:43:15:43:55 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
-| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:55 | html | provenance |  |
-| clipboard.ts:71:13:71:62 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
-| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:62 | droppedHtml | provenance |  |
-| clipboard.ts:98:15:98:54 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
-| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:54 | html | provenance |  |
+| clipboard.ts:8:11:8:14 | html | clipboard.ts:15:25:15:28 | html | provenance |  |
+| clipboard.ts:8:18:8:51 | clipboa ... /html') | clipboard.ts:8:11:8:14 | html | provenance |  |
+| clipboard.ts:43:15:43:18 | html | clipboard.ts:50:29:50:32 | html | provenance |  |
+| clipboard.ts:43:22:43:55 | clipboa ... /html') | clipboard.ts:43:15:43:18 | html | provenance |  |
+| clipboard.ts:71:13:71:23 | droppedHtml | clipboard.ts:73:29:73:39 | droppedHtml | provenance |  |
+| clipboard.ts:71:27:71:62 | e.clipb ... /html') | clipboard.ts:71:13:71:23 | droppedHtml | provenance |  |
+| clipboard.ts:98:15:98:18 | html | clipboard.ts:99:23:99:26 | html | provenance |  |
+| clipboard.ts:98:22:98:54 | dataTra ... /html') | clipboard.ts:98:15:98:18 | html | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:11:15:11:24 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:12:20:12:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:14:20:14:29 | getTaint() | provenance |  |
 | d3.js:4:12:4:22 | window.name | d3.js:21:15:21:24 | getTaint() | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:11:63:11:67 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:12:66:12:70 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:13:59:13:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:16:62:16:66 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:18:59:18:63 | taint | provenance |  |
-| dates.js:9:9:9:69 | taint | dates.js:21:61:21:65 | taint | provenance |  |
-| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:69 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:11:63:11:67 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:12:66:12:70 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:13:59:13:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:16:62:16:66 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:18:59:18:63 | taint | provenance |  |
+| dates.js:9:9:9:13 | taint | dates.js:21:61:21:65 | taint | provenance |  |
+| dates.js:9:17:9:69 | decodeU ... ing(1)) | dates.js:9:9:9:13 | taint | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance |  |
 | dates.js:9:36:9:55 | window.location.hash | dates.js:9:36:9:68 | window. ... ring(1) | provenance | Config |
 | dates.js:9:36:9:68 | window. ... ring(1) | dates.js:9:17:9:69 | decodeU ... ing(1)) | provenance |  |
@@ -772,11 +772,11 @@ edges
 | dates.js:18:59:18:63 | taint | dates.js:18:42:18:64 | datefor ...  taint) | provenance |  |
 | dates.js:21:42:21:66 | dayjs(t ... (taint) | dates.js:21:31:21:68 | `Time i ... aint)}` | provenance |  |
 | dates.js:21:61:21:65 | taint | dates.js:21:42:21:66 | dayjs(t ... (taint) | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:37:77:37:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:38:77:38:81 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:39:79:39:83 | taint | provenance |  |
-| dates.js:30:9:30:69 | taint | dates.js:40:77:40:81 | taint | provenance |  |
-| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:69 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:37:77:37:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:38:77:38:81 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:39:79:39:83 | taint | provenance |  |
+| dates.js:30:9:30:13 | taint | dates.js:40:77:40:81 | taint | provenance |  |
+| dates.js:30:17:30:69 | decodeU ... ing(1)) | dates.js:30:9:30:13 | taint | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance |  |
 | dates.js:30:36:30:55 | window.location.hash | dates.js:30:36:30:68 | window. ... ring(1) | provenance | Config |
 | dates.js:30:36:30:68 | window. ... ring(1) | dates.js:30:17:30:69 | decodeU ... ing(1)) | provenance |  |
@@ -788,10 +788,10 @@ edges
 | dates.js:39:79:39:83 | taint | dates.js:39:42:39:84 | moment. ...  taint) | provenance |  |
 | dates.js:40:42:40:82 | dayjs.f ...  taint) | dates.js:40:31:40:84 | `Time i ... aint)}` | provenance |  |
 | dates.js:40:77:40:81 | taint | dates.js:40:42:40:82 | dayjs.f ...  taint) | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:48:83:48:87 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:49:82:49:86 | taint | provenance |  |
-| dates.js:46:9:46:69 | taint | dates.js:50:97:50:101 | taint | provenance |  |
-| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:69 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:48:83:48:87 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:49:82:49:86 | taint | provenance |  |
+| dates.js:46:9:46:13 | taint | dates.js:50:97:50:101 | taint | provenance |  |
+| dates.js:46:17:46:69 | decodeU ... ing(1)) | dates.js:46:9:46:13 | taint | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance |  |
 | dates.js:46:36:46:55 | window.location.hash | dates.js:46:36:46:68 | window. ... ring(1) | provenance | Config |
 | dates.js:46:36:46:68 | window. ... ring(1) | dates.js:46:17:46:69 | decodeU ... ing(1)) | provenance |  |
@@ -801,10 +801,10 @@ edges
 | dates.js:49:82:49:86 | taint | dates.js:49:42:49:87 | new Dat ... (taint) | provenance |  |
 | dates.js:50:42:50:102 | DateTim ... (taint) | dates.js:50:31:50:104 | `Time i ... aint)}` | provenance |  |
 | dates.js:50:97:50:101 | taint | dates.js:50:42:50:102 | DateTim ... (taint) | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:57:94:57:98 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:59:80:59:84 | taint | provenance |  |
-| dates.js:54:9:54:69 | taint | dates.js:61:81:61:85 | taint | provenance |  |
-| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:69 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:57:94:57:98 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:59:80:59:84 | taint | provenance |  |
+| dates.js:54:9:54:13 | taint | dates.js:61:81:61:85 | taint | provenance |  |
+| dates.js:54:17:54:69 | decodeU ... ing(1)) | dates.js:54:9:54:13 | taint | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance |  |
 | dates.js:54:36:54:55 | window.location.hash | dates.js:54:36:54:68 | window. ... ring(1) | provenance | Config |
 | dates.js:54:36:54:68 | window. ... ring(1) | dates.js:54:17:54:69 | decodeU ... ing(1)) | provenance |  |
@@ -814,12 +814,12 @@ edges
 | dates.js:59:80:59:84 | taint | dates.js:59:42:59:85 | luxon.e ... (taint) | provenance |  |
 | dates.js:61:42:61:86 | dayjs.s ... (taint) | dates.js:61:31:61:88 | `Time i ... aint)}` | provenance |  |
 | dates.js:61:81:61:85 | taint | dates.js:61:42:61:86 | dayjs.s ... (taint) | provenance |  |
-| dragAndDrop.ts:8:11:8:50 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
-| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:50 | html | provenance |  |
-| dragAndDrop.ts:43:15:43:54 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
-| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:54 | html | provenance |  |
-| dragAndDrop.ts:71:13:71:61 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
-| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:61 | droppedHtml | provenance |  |
+| dragAndDrop.ts:8:11:8:14 | html | dragAndDrop.ts:15:25:15:28 | html | provenance |  |
+| dragAndDrop.ts:8:18:8:50 | dataTra ... /html') | dragAndDrop.ts:8:11:8:14 | html | provenance |  |
+| dragAndDrop.ts:43:15:43:18 | html | dragAndDrop.ts:50:29:50:32 | html | provenance |  |
+| dragAndDrop.ts:43:22:43:54 | dataTra ... /html') | dragAndDrop.ts:43:15:43:18 | html | provenance |  |
+| dragAndDrop.ts:71:13:71:23 | droppedHtml | dragAndDrop.ts:73:29:73:39 | droppedHtml | provenance |  |
+| dragAndDrop.ts:71:27:71:61 | e.dataT ... /html') | dragAndDrop.ts:71:13:71:23 | 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 |  |
@@ -836,13 +836,13 @@ edges
 | 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 |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
-| jquery.js:2:7:2:40 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
-| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:40 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:4:5:4:11 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:8:28:8:34 | tainted | provenance |  |
+| jquery.js:2:7:2:13 | tainted | jquery.js:36:25:36:31 | tainted | provenance |  |
+| jquery.js:2:17:2:40 | documen ... .search | jquery.js:2:7:2:13 | tainted | provenance |  |
 | jquery.js:4:5:4:11 | tainted | jquery.js:5:13:5:19 | tainted | provenance |  |
 | jquery.js:5:13:5:19 | tainted | jquery.js:6:11:6:17 | tainted | provenance |  |
 | jquery.js:6:11:6:17 | tainted | jquery.js:7:20:7:26 | tainted | provenance |  |
@@ -856,13 +856,13 @@ edges
 | jquery.js:15:38:15:59 | window. ... .search | jquery.js:15:19:15:60 | decodeU ... search) | provenance |  |
 | jquery.js:16:38:16:52 | window.location | jquery.js:16:38:16:63 | window. ... tring() | provenance |  |
 | jquery.js:16:38:16:63 | window. ... tring() | jquery.js:16:19:16:64 | decodeU ... ring()) | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
-| jquery.js:18:7:18:33 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
-| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:33 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:21:5:21:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:22:5:22:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:23:5:23:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:24:5:24:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:27:5:27:8 | hash | provenance |  |
+| jquery.js:18:7:18:10 | hash | jquery.js:34:13:34:16 | hash | provenance |  |
+| jquery.js:18:14:18:33 | window.location.hash | jquery.js:18:7:18:10 | hash | provenance |  |
 | jquery.js:21:5:21:8 | hash | jquery.js:21:5:21:21 | hash.substring(1) | provenance | Config |
 | jquery.js:22:5:22:8 | hash | jquery.js:22:5:22:25 | hash.su ... (1, 10) | provenance | Config |
 | jquery.js:23:5:23:8 | hash | jquery.js:23:5:23:18 | hash.substr(1) | provenance | Config |
@@ -872,51 +872,51 @@ edges
 | jquery.js:34:13:34:16 | hash | jquery.js:34:5:34:25 | '<b>' + ...  '</b>' | provenance | Config |
 | jquery.js:36:25:36:31 | tainted | jquery.js:37:31:37:37 | tainted | provenance |  |
 | jquery.js:37:31:37:37 | tainted | jquery.js:37:25:37:37 | () => tainted | provenance | Config |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
-| json-stringify.jsx:5:9:5:36 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
-| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:36 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:11:51:11:56 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:19:56:19:61 | locale | provenance |  |
+| json-stringify.jsx:5:9:5:14 | locale | json-stringify.jsx:31:55:31:60 | locale | provenance |  |
+| json-stringify.jsx:5:18:5:36 | req.param("locale") | json-stringify.jsx:5:9:5:14 | locale | provenance |  |
 | json-stringify.jsx:11:51:11:56 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:19:56:19:61 | locale | json-stringify.jsx:35:40:35:61 | JSON.st ... jsonLD) | provenance |  |
 | json-stringify.jsx:31:55:31:60 | locale | json-stringify.jsx:31:40:31:61 | JSON.st ... locale) | provenance |  |
-| 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:7:9:7:13 | 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:13 | 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: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 |  |
+| jwt.js:5:9:5:15 | decoded | jwt.js:6:14:6:20 | decoded | provenance |  |
+| jwt.js:5:19:5:34 | jwt_decode(data) | jwt.js:5:9:5:15 | decoded | provenance |  |
 | jwt.js:5:30:5:33 | data | jwt.js:5:19:5:34 | jwt_decode(data) | 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 |  |
-| optionalSanitizer.js:2:7:2:39 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
-| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:39 | target | provenance |  |
-| optionalSanitizer.js:8:7:8:22 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
-| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:22 | tainted | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:6:18:6:23 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:8:17:8:22 | target | provenance |  |
+| optionalSanitizer.js:2:7:2:12 | target | optionalSanitizer.js:15:9:15:14 | target | provenance |  |
+| optionalSanitizer.js:2:16:2:39 | documen ... .search | optionalSanitizer.js:2:7:2:12 | target | provenance |  |
+| optionalSanitizer.js:8:7:8:13 | tainted | optionalSanitizer.js:9:18:9:24 | tainted | provenance |  |
+| optionalSanitizer.js:8:17:8:22 | target | optionalSanitizer.js:8:7:8:13 | tainted | provenance |  |
 | optionalSanitizer.js:15:9:15:14 | target | optionalSanitizer.js:16:18:16:18 | x | provenance |  |
 | optionalSanitizer.js:16:18:16:18 | x | optionalSanitizer.js:17:20:17:20 | x | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
-| optionalSanitizer.js:26:7:26:39 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
-| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:39 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:31:18:31:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:38:18:38:23 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:41:45:46 | target | provenance |  |
+| optionalSanitizer.js:26:7:26:12 | target | optionalSanitizer.js:45:51:45:56 | target | provenance |  |
+| optionalSanitizer.js:26:16:26:39 | documen ... .search | optionalSanitizer.js:26:7:26:12 | target | provenance |  |
 | optionalSanitizer.js:28:24:28:24 | x | optionalSanitizer.js:29:12:29:12 | x | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:7:31:23 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:23 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:5:34:36 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
-| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:36 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:32:18:32:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:34:28:34:35 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:7:31:14 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:31:18:31:23 | target | optionalSanitizer.js:31:7:31:14 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:5:34:12 | tainted2 | optionalSanitizer.js:36:18:36:25 | tainted2 | provenance |  |
+| optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | optionalSanitizer.js:34:5:34:12 | tainted2 | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:34:28:34:35 | tainted2 | optionalSanitizer.js:34:16:34:36 | sanitiz ... inted2) | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:7:38:23 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:23 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:5:41:36 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
-| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:36 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:39:18:39:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:41:28:41:35 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:7:38:14 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:38:18:38:23 | target | optionalSanitizer.js:38:7:38:14 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:5:41:12 | tainted3 | optionalSanitizer.js:43:18:43:25 | tainted3 | provenance |  |
+| optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | optionalSanitizer.js:41:5:41:12 | tainted3 | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:28:24:28:24 | x | provenance |  |
 | optionalSanitizer.js:41:28:41:35 | tainted3 | optionalSanitizer.js:41:16:41:36 | sanitiz ... inted3) | provenance |  |
 | optionalSanitizer.js:45:29:45:47 | sanitizeBad(target) | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
@@ -925,8 +925,8 @@ edges
 | optionalSanitizer.js:45:51:45:56 | target | optionalSanitizer.js:45:18:45:56 | sanitiz ...  target | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [id] | pages/[id].jsx:13:44:13:49 | params [id] | provenance |  |
 | pages/[id].jsx:3:30:3:35 | params [q] | pages/[id].jsx:16:44:16:49 | params [q] | provenance |  |
-| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:9:5:29 | id | provenance |  |
-| pages/[id].jsx:5:9:5:29 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
+| pages/[id].jsx:5:9:5:14 | { id } | pages/[id].jsx:5:11:5:12 | id | provenance |  |
+| pages/[id].jsx:5:11:5:12 | id | pages/[id].jsx:10:44:10:45 | id | provenance |  |
 | 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 |  |
@@ -936,30 +936,30 @@ edges
 | 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      ... 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 |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:18:8:24 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | 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:13 | tainted | provenance |  |
 | react-use-router.js:8:21:8:32 | router.query | react-use-router.js:8:21:8:39 | router.query.foobar | provenance |  |
 | react-use-router.js:11:24:11:35 | router.query | react-use-router.js:11:24:11:42 | router.query.foobar | provenance |  |
 | react-use-router.js:23:43:23:54 | router.query | react-use-router.js:23:43:23:61 | router.query.foobar | provenance |  |
 | react-use-router.js:33:21:33:32 | router.query | react-use-router.js:33:21:33:39 | router.query.foobar | provenance |  |
-| react-use-state.js:4:9:4:49 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
-| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:9:4:49 | state | provenance |  |
-| react-use-state.js:9:9:9:43 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
-| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:9:9:43 | state | provenance |  |
-| react-use-state.js:15:9:15:43 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
-| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:9:15:43 | state | provenance |  |
+| react-use-state.js:4:10:4:14 | state | react-use-state.js:5:51:5:55 | state | provenance |  |
+| react-use-state.js:4:38:4:48 | window.name | react-use-state.js:4:10:4:14 | state | provenance |  |
+| react-use-state.js:9:10:9:14 | state | react-use-state.js:11:51:11:55 | state | provenance |  |
+| react-use-state.js:10:14:10:24 | window.name | react-use-state.js:9:10:9:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:15:10:15:14 | state | provenance |  |
+| react-use-state.js:15:10:15:14 | state | react-use-state.js:17:51:17:55 | state | provenance |  |
 | react-use-state.js:16:20:16:30 | window.name | react-use-state.js:15:10:15:14 | state | provenance |  |
 | react-use-state.js:21:10:21:14 | state | react-use-state.js:22:14:22:17 | prev | provenance |  |
 | react-use-state.js:22:14:22:17 | prev | react-use-state.js:23:35:23:38 | prev | provenance |  |
 | react-use-state.js:25:20:25:30 | window.name | react-use-state.js:21:10:21:14 | state | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
-| sanitiser.js:16:7:16:27 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
-| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:27 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:23:29:23:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:30:29:30:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:33:29:33:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:38:29:38:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:45:29:45:35 | tainted | provenance |  |
+| sanitiser.js:16:7:16:13 | tainted | sanitiser.js:48:19:48:25 | tainted | provenance |  |
+| sanitiser.js:16:17:16:27 | window.name | sanitiser.js:16:7:16:13 | tainted | provenance |  |
 | sanitiser.js:23:29:23:35 | tainted | sanitiser.js:23:21:23:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:30:29:30:35 | tainted | sanitiser.js:30:21:30:44 | '<b>' + ...  '</b>' | provenance |  |
 | sanitiser.js:33:29:33:35 | tainted | sanitiser.js:33:21:33:44 | '<b>' + ...  '</b>' | provenance |  |
@@ -969,8 +969,8 @@ edges
 | stored-xss.js:2:39:2:62 | documen ... .search | stored-xss.js:5:20:5:52 | session ... ssion') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:8:20:8:48 | localSt ... local') | provenance |  |
 | stored-xss.js:3:35:3:58 | documen ... .search | stored-xss.js:10:16:10:44 | localSt ... local') | provenance |  |
-| stored-xss.js:10:9:10:44 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
-| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:44 | href | provenance |  |
+| stored-xss.js:10:9:10:12 | href | stored-xss.js:12:35:12:38 | href | provenance |  |
+| stored-xss.js:10:16:10:44 | localSt ... local') | stored-xss.js:10:9:10:12 | href | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance |  |
 | stored-xss.js:12:35:12:38 | href | stored-xss.js:12:20:12:54 | "<a hre ... ar</a>" | provenance | Config |
 | string-manipulations.js:5:16:5:37 | documen ... on.href | string-manipulations.js:5:16:5:47 | documen ... lueOf() | provenance |  |
@@ -980,24 +980,24 @@ edges
 | string-manipulations.js:9:36:9:57 | documen ... on.href | string-manipulations.js:9:16:9:58 | String. ... n.href) | provenance |  |
 | string-manipulations.js:10:23:10:44 | documen ... on.href | string-manipulations.js:10:16:10:45 | String( ... n.href) | provenance |  |
 | tainted-url-suffix-arguments.js:3:17:3:17 | y | tainted-url-suffix-arguments.js:6:22:6:22 | y | provenance |  |
-| tainted-url-suffix-arguments.js:11:11:11:36 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
-| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:36 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:11:11:13 | url | tainted-url-suffix-arguments.js:12:17:12:19 | url | provenance |  |
+| tainted-url-suffix-arguments.js:11:17:11:36 | window.location.href | tainted-url-suffix-arguments.js:11:11:11:13 | url | provenance |  |
 | tainted-url-suffix-arguments.js:12:17:12:19 | url | tainted-url-suffix-arguments.js:3:17:3:17 | y | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
-| tooltip.jsx:6:11:6:30 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
-| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:30 | source | provenance |  |
-| tooltip.jsx:17:11:17:33 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
-| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:33 | provide [source] | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:10:25:10:30 | source | provenance |  |
+| tooltip.jsx:6:11:6:16 | source | tooltip.jsx:11:25:11:30 | source | provenance |  |
+| tooltip.jsx:6:20:6:30 | window.name | tooltip.jsx:6:11:6:16 | source | provenance |  |
+| tooltip.jsx:17:11:17:17 | provide [source] | tooltip.jsx:18:51:18:57 | provide [source] | provenance |  |
+| tooltip.jsx:17:21:17:33 | props.provide [source] | tooltip.jsx:17:11:17:17 | provide [source] | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:18:51:18:59 | provide() | provenance |  |
 | tooltip.jsx:18:51:18:57 | provide [source] | tooltip.jsx:23:38:23:43 | source | provenance |  |
-| tooltip.jsx:22:11:22:30 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
-| 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: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 |  |
+| tooltip.jsx:22:11:22:16 | source | tooltip.jsx:17:21:17:33 | props.provide [source] | provenance |  |
+| tooltip.jsx:22:20:22:30 | window.name | tooltip.jsx:22:11:22:16 | source | provenance |  |
+| translate.js:6:7:6:12 | target | translate.js:7:42:7:47 | target | provenance |  |
+| translate.js:6:16:6:39 | documen ... .search | translate.js:6:7:6:12 | target | provenance |  |
+| translate.js:7:7:7:18 | searchParams | translate.js:8:27:8:38 | searchParams | provenance |  |
+| translate.js:7:7:7:18 | 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:18 | searchParams | provenance |  |
+| translate.js:7:22:7:61 | new URL ... ing(1)) [MapValue] | translate.js:7:7:7:18 | searchParams [MapValue] | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance |  |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
 | translate.js:7:42:7:47 | target | translate.js:7:42:7:60 | target.substring(1) | provenance | Config |
@@ -1024,32 +1024,32 @@ 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: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:2:7:2:12 | target | tst.js:4:18:4:23 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:9:28:9:33 | target | provenance |  |
+| tst.js:2:7:2:12 | target | tst.js:17:42:17:47 | target | provenance |  |
+| tst.js:2:16:2:39 | documen ... .search | tst.js:2:7:2:12 | 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:7:14:12 | params | tst.js:15:18:15:23 | params | provenance |  |
+| tst.js:14:7:14:12 | 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:16:14:56 | (new UR ... hParams | tst.js:14:7:14:12 | params | provenance |  |
+| tst.js:14:16:14:56 | (new UR ... hParams [MapValue] | tst.js:14:7:14:12 | 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:7:17:18 | searchParams | tst.js:18:18:18:29 | searchParams | provenance |  |
+| tst.js:17:7:17:18 | 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:18 | searchParams | provenance |  |
+| tst.js:17:22:17:61 | new URL ... ing(1)) [MapValue] | tst.js:17:7:17:18 | 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 |
@@ -1099,31 +1099,31 @@ edges
 | 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:7:93:7 | v | tst.js:95:18:95:18 | v | provenance |  |
+| tst.js:93:7:93:7 | 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:93:11:93:44 | documen ... bstr(1) | tst.js:93:7:93:7 | 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:161:9:161:14 | target | tst.js:164:28:164:33 | target | provenance |  |
+| tst.js:161:18:161:41 | documen ... .search | tst.js:161:9:161:14 | target | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:170:31:170:37 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:172:42:172:48 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:173:33:173:39 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:175:54:175:60 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:176:45:176:51 | tainted | provenance |  |
+| tst.js:168:9:168:15 | tainted | tst.js:177:49:177:55 | tainted | provenance |  |
+| tst.js:168:19:168:42 | documen ... .search | tst.js:168:9:168:15 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:183:67:183:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:184:67:184:73 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:220:35:220:41 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:222:20:222:26 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:224:23:224:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:225:23:225:29 | tainted | provenance |  |
+| tst.js:181:9:181:15 | tainted | tst.js:239:23:239:29 | tainted | provenance |  |
+| tst.js:181:19:181:42 | documen ... .search | tst.js:181:9:181:15 | 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 |  |
@@ -1144,8 +1144,8 @@ edges
 | 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:269:9:269:15 | tainted | tst.js:272:59:272:65 | tainted | provenance |  |
+| tst.js:269:19:269:29 | window.name | tst.js:269:9:269:15 | 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 |  |
@@ -1154,34 +1154,34 @@ edges
 | 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:7:315:12 | params | tst.js:316:18:316:23 | params | provenance |  |
+| tst.js:315:7:315:12 | 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:315:16:315:43 | getTain ... hParams | tst.js:315:7:315:12 | params | provenance |  |
+| tst.js:315:16:315:43 | getTain ... hParams [MapValue] | tst.js:315:7:315:12 | 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:332:7:332:12 | target | tst.js:333:12:333:17 | target | provenance |  |
+| tst.js:332:16:332:39 | documen ... .search | tst.js:332:7:332:12 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:340:16:340:21 | target | provenance |  |
+| tst.js:339:10:339:15 | target | tst.js:341:20:341:25 | target | provenance |  |
+| tst.js:339:19:339:42 | documen ... .search | tst.js:339:10:339:15 | 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:355:7:355:12 | target | tst.js:357:18:357:23 | target | provenance |  |
+| tst.js:355:16:355:39 | documen ... .search | tst.js:355:7:355:12 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:367:18:367:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:369:18:369:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:380:18:380:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:389:18:389:23 | target | provenance |  |
+| tst.js:364:7:364:12 | target | tst.js:391:19:391:24 | target | provenance |  |
+| tst.js:364:16:364:39 | documen ... .search | tst.js:364:7:364:12 | 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 |  |
@@ -1194,65 +1194,65 @@ edges
 | 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:7:399:13 | 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:399:17:399:46 | window. ... bstr(1) | tst.js:399:7:399:13 | payload | provenance |  |
+| tst.js:402:7:402:11 | 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:402:15:402:55 | window. ... (\\w+)/) | tst.js:402:7:402:11 | 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:411:7:411:12 | target | tst.js:413:18:413:23 | target | provenance |  |
+| tst.js:411:16:411:39 | documen ... .search | tst.js:411:7:411:12 | 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:419:6:419:11 | source | tst.js:423:28:423:33 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:424:33:424:38 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:425:34:425:39 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:426:41:426:46 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:427:44:427:49 | source | provenance |  |
+| tst.js:419:6:419:11 | source | tst.js:428:32:428:37 | source | provenance |  |
+| tst.js:419:15:419:38 | documen ... .search | tst.js:419:6:419:11 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:438:18:438:23 | source | provenance |  |
+| tst.js:436:7:436:12 | source | tst.js:439:36:439:41 | source | provenance |  |
+| tst.js:436:16:436:39 | documen ... .search | tst.js:436:7:436:12 | 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:443:6:443:11 | source | tst.js:446:21:446:26 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:448:19:448:24 | source | provenance |  |
+| tst.js:443:6:443:11 | source | tst.js:450:20:450:25 | source | provenance |  |
+| tst.js:443:15:443:38 | documen ... .search | tst.js:443:6:443:11 | source | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:456:19:456:21 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:457:26:457:28 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:458:25:458:27 | url | provenance |  |
+| tst.js:454:7:454:9 | url | tst.js:459:20:459:22 | url | provenance |  |
+| tst.js:454:7:454:9 | 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:454:13:454:46 | documen ... bstr(1) | tst.js:454:7:454:9 | 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:491:7:491:12 | target | tst.js:492:18:492:23 | target | provenance |  |
+| tst.js:491:16:491:39 | documen ... .search | tst.js:491:7:491:12 | 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:498:7:498:12 | source | tst.js:499:27:499:32 | source | provenance |  |
+| tst.js:498:16:498:26 | window.name | tst.js:498:7:498:12 | 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:20:13:20:18 | target | typeahead.js:21:12:21:17 | target | provenance |  |
+| typeahead.js:20:22:20:45 | documen ... .search | typeahead.js:20:13:20:18 | 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 |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:6:2:39 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
-| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:39 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:4:14:4:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:5:12:5:18 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:6:19:6:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:7:14:7:20 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:9:19:9:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:10:16:10:22 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:11:24:11:30 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:6:2:12 | tainted | various-concat-obfuscations.js:12:19:12:25 | tainted | provenance |  |
+| various-concat-obfuscations.js:2:16:2:39 | documen ... .search | various-concat-obfuscations.js:2:6:2:12 | tainted | provenance |  |
 | various-concat-obfuscations.js:4:14:4:20 | tainted | various-concat-obfuscations.js:4:4:4:31 | "<div>" ... </div>" | provenance | Config |
 | various-concat-obfuscations.js:5:12:5:18 | tainted | various-concat-obfuscations.js:5:4:5:26 | `<div>$ ... </div>` | provenance | Config |
 | various-concat-obfuscations.js:6:4:6:26 | "<div>" ... ainted) | various-concat-obfuscations.js:6:4:6:43 | "<div>" ... /div>") | provenance |  |
@@ -1282,20 +1282,20 @@ edges
 | various-concat-obfuscations.js:21:17:21:40 | documen ... .search | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:17:24:17:28 | attrs | provenance |  |
 | various-concat-obfuscations.js:21:17:21:46 | documen ... h.attrs | various-concat-obfuscations.js:21:4:21:47 | indirec ... .attrs) | provenance | Config |
-| winjs.js:2:7:2:53 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
-| winjs.js:2:7:2:53 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:3:43:3:49 | tainted | provenance |  |
+| winjs.js:2:7:2:13 | tainted | winjs.js:4:43:4:49 | tainted | provenance |  |
 | 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 |  |
-| xmlRequest.js:8:13:8:47 | json | xmlRequest.js:9:28:9:31 | json | provenance |  |
-| xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | xmlRequest.js:8:13:8:47 | json | provenance |  |
+| winjs.js:2:17:2:53 | documen ... ring(1) | winjs.js:2:7:2:13 | tainted | provenance |  |
+| xmlRequest.js:8:13:8:16 | json | xmlRequest.js:9:28:9:31 | json | provenance |  |
+| xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | xmlRequest.js:8:13:8:16 | json | provenance |  |
 | xmlRequest.js:8:31:8:46 | xhr.responseText | xmlRequest.js:8:20:8:47 | JSON.pa ... seText) | provenance |  |
 | xmlRequest.js:9:28:9:31 | json | xmlRequest.js:9:28:9:39 | json.message | provenance |  |
-| xmlRequest.js:20:11:20:48 | resp | xmlRequest.js:21:29:21:32 | resp | provenance |  |
-| xmlRequest.js:20:18:20:48 | await g ... rl }}") | xmlRequest.js:20:11:20:48 | resp | provenance |  |
+| xmlRequest.js:20:11:20:14 | resp | xmlRequest.js:21:29:21:32 | resp | provenance |  |
+| xmlRequest.js:20:18:20:48 | await g ... rl }}") | xmlRequest.js:20:11:20:14 | resp | provenance |  |
 | xmlRequest.js:20:24:20:48 | got.get ... rl }}") | xmlRequest.js:20:18:20:48 | await g ... rl }}") | provenance |  |
-| xmlRequest.js:21:11:21:38 | json | xmlRequest.js:22:24:22:27 | json | provenance |  |
-| xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | xmlRequest.js:21:11:21:38 | json | provenance |  |
+| xmlRequest.js:21:11:21:14 | json | xmlRequest.js:22:24:22:27 | json | provenance |  |
+| xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | xmlRequest.js:21:11:21:14 | json | provenance |  |
 | xmlRequest.js:21:29:21:32 | resp | xmlRequest.js:21:18:21:38 | JSON.pa ... p.body) | provenance |  |
 | xmlRequest.js:22:24:22:27 | json | xmlRequest.js:22:24:22:35 | json.message | provenance |  |
 subpaths
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 afc30e246085..99cafddc41d2 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
@@ -20,18 +20,18 @@
 | 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 |  |
+| interceptors.js:8:15:8:31 | userGeneratedHtml | interceptors.js:9:56:9:72 | userGeneratedHtml | provenance |  |
+| interceptors.js:8:35:8:42 | response | interceptors.js:8:15:8:31 | userGeneratedHtml | provenance |  |
+| test.jsx:5:11:5:18 | response | test.jsx:6:24:6:31 | response | provenance |  |
+| test.jsx:5:22:5:63 | await f ... ntent") | test.jsx:5:11:5:18 | response | provenance |  |
 | test.jsx:5:28:5:63 | fetch(" ... ntent") | test.jsx:5:22:5:63 | await f ... ntent") | provenance |  |
-| test.jsx:6:11:6:38 | data | test.jsx:7:12:7:15 | data | provenance |  |
-| test.jsx:6:18:6:38 | await r ... .json() | test.jsx:6:11:6:38 | data | provenance |  |
+| test.jsx:6:11:6:14 | data | test.jsx:7:12:7:15 | data | provenance |  |
+| test.jsx:6:18:6:38 | await r ... .json() | test.jsx:6:11:6:14 | 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: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.jsx:15:13:15:16 | data | test.jsx:15:13:15:16 | data | provenance |  |
+| test.jsx:15:13:15:16 | data | test.jsx:27:29:27:32 | 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 |  |
@@ -41,78 +41,78 @@ edges
 | 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:7:45:7:48 | data | test.vue:7:45:7:48 | data | provenance |  |
+| test.vue:7:45:7:48 | data | test.vue:15:21:15:24 | data | provenance |  |
+| test.vue:10:15:10:22 | response | test.vue:11:16:11:23 | response | provenance |  |
+| test.vue:10:26:10:84 | await f ... sts/1") | test.vue:10:15:10:22 | 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:5:9:5:19 | commentData | testReactRelay.tsx:7:43:7:53 | commentData | provenance |  |
+| testReactRelay.tsx:5:23:5:52 | useFrag ... entRef) | testReactRelay.tsx:5:9:5:19 | 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:17:9:17:12 | data | testReactRelay.tsx:18:48:18:51 | data | provenance |  |
+| testReactRelay.tsx:17:16:17:42 | useLazy ... ry, {}) | testReactRelay.tsx:17:9:17:12 | 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:37:9:37:12 | data | testReactRelay.tsx:38:49:38:52 | data | provenance |  |
+| testReactRelay.tsx:37:16:37:40 | useClie ... ry, {}) | testReactRelay.tsx:37:9:37:12 | data | provenance |  |
+| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:44:10:44:13 | data | provenance |  |
+| testReactRelay.tsx:44:10:44:13 | data | testReactRelay.tsx:47:46:47:49 | data | provenance |  |
+| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:62:5:62:8 | data | provenance |  |
+| testReactRelay.tsx:62:5:62:8 | data | testReactRelay.tsx:71:49:71:52 | data | provenance |  |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:80:10:80:21 | feedbackText | provenance |  |
+| testReactRelay.tsx:80:10:80:21 | feedbackText | testReactRelay.tsx:88:50:88:61 | 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:95:10:95:20 | fragmentRef | testReactRelay.tsx:95:10:95:20 | fragmentRef | provenance |  |
+| testReactRelay.tsx:95:10:95:20 | fragmentRef | testReactRelay.tsx:113:48:113:58 | 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 |  |
+| testReactRelay.tsx:136:9:136:12 | data | testReactRelay.tsx:137:50:137:53 | data | provenance |  |
+| testReactRelay.tsx:136:16:136:39 | readFra ... y, key) | testReactRelay.tsx:136:9:136:12 | data | provenance |  |
+| testReactUseQueries.jsx:4:9:4:16 | response | testReactUseQueries.jsx:5:10:5:17 | response | provenance |  |
+| testReactUseQueries.jsx:4:20:4:53 | await f ... e.com') | testReactUseQueries.jsx:4:9:4:16 | 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:11:6:18 | response | testUseQueries2.vue:7:24:7:31 | response | provenance |  |
+| testUseQueries2.vue:6:22:6:63 | await f ... ntent") | testUseQueries2.vue:6:11:6:18 | 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:11:7:14 | data | testUseQueries2.vue:8:12:8:15 | data | provenance |  |
+| testUseQueries2.vue:7:18:7:38 | await r ... .json() | testUseQueries2.vue:7:11:7:14 | 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:11:12:18 | response | testUseQueries2.vue:13:12:13:19 | response | provenance |  |
+| testUseQueries2.vue:12:22:12:41 | await fetch("${id}") | testUseQueries2.vue:12:11:12:18 | 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:19:11:26 | response | testUseQueries.vue:12:20:12:27 | response | provenance |  |
+| testUseQueries.vue:11:30:11:49 | await fetch("${id}") | testUseQueries.vue:11:19:11:26 | 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:15:8:31 | 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:11:5:18 | 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") |
-| test.jsx:6:11:6:38 | data | semmle.label | data |
+| test.jsx:6:11:6:14 | data | semmle.label | data |
 | test.jsx:6:18:6:38 | await r ... .json() | semmle.label | await r ... .json() |
 | test.jsx:6:24:6:31 | response | semmle.label | response |
 | 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: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') |
@@ -124,40 +124,40 @@ nodes
 | 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:7:45:7:48 | data | semmle.label | data |
+| test.vue:10:15:10:22 | 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:9:5:19 | 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:9:17:12 | 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:9:37:12 | 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: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: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: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: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 |
@@ -165,31 +165,31 @@ nodes
 | 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:9:136:12 | 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:9:4:16 | 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:11:6:18 | 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:11:7:14 | 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:11:12:18 | 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:19:11:26 | 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 |
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 350f7bf5431c..595187bdf6ff 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
@@ -18,16 +18,16 @@
 | 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:2:6:2:8 | foo | exception-xss.js:9:11:9:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:15:9:15:11 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:21:11:21:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:33:19:33:21 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:46:16:46:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:81:16:81:18 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:89:11:89:13 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | foo | exception-xss.js:95:12:95:14 | foo | provenance |  |
+| exception-xss.js:2:6:2:8 | 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:8 | 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 |  |
@@ -75,10 +75,10 @@ edges
 | 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:146:6:146:8 | foo | exception-xss.js:148:33:148:35 | foo | provenance |  |
+| exception-xss.js:146:6:146:8 | foo | exception-xss.js:153:8:153:10 | foo | provenance |  |
+| exception-xss.js:146:6:146:8 | 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:8 | 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 |  |
@@ -95,7 +95,7 @@ edges
 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 |
-| exception-xss.js:2:6:2:28 | foo | semmle.label | foo |
+| exception-xss.js:2:6:2:8 | foo | semmle.label | foo |
 | exception-xss.js:2:12:2:28 | document.location | semmle.label | document.location |
 | exception-xss.js:4:17:4:17 | x | semmle.label | x |
 | exception-xss.js:5:11:5:11 | x | semmle.label | x |
@@ -154,7 +154,7 @@ nodes
 | exception-xss.js:136:10:136:22 | req.params.id | semmle.label | req.params.id |
 | exception-xss.js:136:26:136:30 | error | semmle.label | error |
 | exception-xss.js:138:19:138:23 | error | semmle.label | error |
-| exception-xss.js:146:6:146:35 | foo | semmle.label | foo |
+| exception-xss.js:146:6:146:8 | foo | semmle.label | foo |
 | exception-xss.js:146:12:146:35 | documen ... .search | semmle.label | documen ... .search |
 | exception-xss.js:148:2:148:46 | new Pro ... solve)) [PromiseError] | semmle.label | new Pro ... solve)) [PromiseError] |
 | exception-xss.js:148:33:148:35 | foo | semmle.label | foo |
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 c1e626a688a9..e536364f805d 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
@@ -78,8 +78,8 @@ edges
 | 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:29:7:29:13 | mytable | ReflectedXss.js:33:12:33:18 | mytable | provenance |  |
+| ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | ReflectedXss.js:29:7:29:13 | mytable | provenance |  |
 | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | provenance |  |
 | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | provenance |  |
 | ReflectedXss.js:31:14:31:21 | req.body | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | provenance |  |
@@ -97,23 +97,23 @@ edges
 | 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:113:13:113:27 | keys: queryKeys | ReflectedXss.js:113:19:113:27 | queryKeys | provenance |  |
+| ReflectedXss.js:113:19:113:27 | queryKeys | ReflectedXss.js:115:18:115:26 | queryKeys | provenance |  |
+| ReflectedXss.js:115:11:115:14 | keys | ReflectedXss.js:117:50:117:53 | keys | provenance |  |
+| ReflectedXss.js:115:11:115:14 | keys | ReflectedXss.js:117:58:117:61 | keys | provenance |  |
+| ReflectedXss.js:115:18:115:26 | queryKeys | ReflectedXss.js:115:11:115:14 | keys | provenance |  |
+| ReflectedXss.js:115:31:115:45 | paramKeys?.keys | ReflectedXss.js:115:11:115:14 | keys | provenance |  |
+| ReflectedXss.js:117:11:117:18 | keyArray | ReflectedXss.js:118:25:118:32 | keyArray | provenance |  |
+| ReflectedXss.js:117:11:117:18 | keyArray [0] | ReflectedXss.js:118:25:118:32 | keyArray [0] | provenance |  |
+| ReflectedXss.js:117:49:117:54 | [keys] [0] | ReflectedXss.js:117:11:117:18 | 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:117:58:117:61 | keys | ReflectedXss.js:117:11:117:18 | keyArray | provenance |  |
+| ReflectedXss.js:118:11:118:21 | invalidKeys | ReflectedXss.js:121:33:121:43 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:11:118:21 | 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:118:25:118:72 | keyArra ... s(key)) | ReflectedXss.js:118:11:118:21 | invalidKeys | provenance |  |
+| ReflectedXss.js:118:25:118:72 | keyArra ... s(key)) [0] | ReflectedXss.js:118:11:118:21 | 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 |  |
@@ -123,11 +123,11 @@ edges
 | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | provenance |  |
 | ReflectedXssGood3.js:68:22:68:26 | value | ReflectedXssGood3.js:77:16:77:20 | value | provenance |  |
 | ReflectedXssGood3.js:68:22:68:26 | value | ReflectedXssGood3.js:105:18:105:22 | value | provenance |  |
-| ReflectedXssGood3.js:77:7:77:37 | parts | ReflectedXssGood3.js:108:10:108:14 | parts | provenance |  |
-| ReflectedXssGood3.js:77:7:77:37 | parts [0] | ReflectedXssGood3.js:108:10:108:14 | parts [0] | provenance |  |
-| ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | ReflectedXssGood3.js:77:7:77:37 | parts [0] | provenance |  |
+| ReflectedXssGood3.js:77:7:77:11 | parts | ReflectedXssGood3.js:108:10:108:14 | parts | provenance |  |
+| ReflectedXssGood3.js:77:7:77:11 | parts [0] | ReflectedXssGood3.js:108:10:108:14 | parts [0] | provenance |  |
+| ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | ReflectedXssGood3.js:77:7:77:11 | parts [0] | provenance |  |
 | ReflectedXssGood3.js:77:16:77:20 | value | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | provenance |  |
-| ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:7:77:37 | parts | provenance |  |
+| ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:7:77:11 | parts | provenance |  |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | provenance |  |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:105:7:105:11 | [post update] parts [ArrayElement] | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | provenance |  |
@@ -136,34 +136,34 @@ edges
 | ReflectedXssGood3.js:108:10:108:14 | parts | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:108:10:108:14 | parts [0] | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
 | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | provenance |  |
-| ReflectedXssGood3.js:135:9:135:27 | url | ReflectedXssGood3.js:139:24:139:26 | url | provenance |  |
-| ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:135:9:135:27 | url | provenance |  |
+| ReflectedXssGood3.js:135:9:135:11 | url | ReflectedXssGood3.js:139:24:139:26 | url | provenance |  |
+| ReflectedXssGood3.js:135:15:135:27 | req.params.id | ReflectedXssGood3.js:135:9:135:11 | url | provenance |  |
 | ReflectedXssGood3.js:139:24:139:26 | url | ReflectedXssGood3.js:68:22:68:26 | value | provenance |  |
 | ReflectedXssGood3.js:139:24:139:26 | url | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:5:18:5:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:13:18:13:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:25:18:25:21 | body | provenance |  |
-| app/api/route.ts:2:11:2:33 | body | app/api/route.ts:29:25:29:28 | body | provenance |  |
-| app/api/route.ts:2:18:2:33 | await req.json() | app/api/route.ts:2:11:2:33 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:5:18:5:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:13:18:13:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:25:18:25:21 | body | provenance |  |
+| app/api/route.ts:2:11:2:14 | body | app/api/route.ts:29:25:29:28 | body | provenance |  |
+| app/api/route.ts:2:18:2:33 | await req.json() | app/api/route.ts:2:11:2:14 | body | provenance |  |
 | app/api/route.ts:2:24:2:33 | req.json() | app/api/route.ts:2:18:2:33 | await req.json() | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:7:20:7:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:15:20:15:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:27:20:27:23 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | app/api/routeNextRequest.ts:31:27:31:30 | body | provenance |  |
-| app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | app/api/routeNextRequest.ts:4:9:4:31 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:7:20:7:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:15:20:15:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:27:20:27:23 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | app/api/routeNextRequest.ts:31:27:31:30 | body | provenance |  |
+| app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | app/api/routeNextRequest.ts:4:9:4:12 | body | provenance |  |
 | app/api/routeNextRequest.ts:4:22:4:31 | req.json() | app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | provenance |  |
-| etherpad.js:9:5:9:53 | response | etherpad.js:11:12:11:19 | response | provenance |  |
-| etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:9:5:9:53 | response | provenance |  |
-| formatting.js:4:9:4:29 | evil | formatting.js:6:43:6:46 | evil | provenance |  |
-| formatting.js:4:9:4:29 | evil | formatting.js:7:49:7:52 | evil | provenance |  |
-| formatting.js:4:16:4:29 | req.query.evil | formatting.js:4:9:4:29 | evil | provenance |  |
+| etherpad.js:9:5:9:12 | response | etherpad.js:11:12:11:19 | response | provenance |  |
+| etherpad.js:9:16:9:30 | req.query.jsonp | etherpad.js:9:5:9:12 | response | provenance |  |
+| formatting.js:4:9:4:12 | evil | formatting.js:6:43:6:46 | evil | provenance |  |
+| formatting.js:4:9:4:12 | evil | formatting.js:7:49:7:52 | evil | provenance |  |
+| formatting.js:4:16:4:29 | req.query.evil | formatting.js:4:9:4:12 | evil | provenance |  |
 | formatting.js:6:43:6:46 | evil | formatting.js:6:14:6:47 | util.fo ... , evil) | provenance |  |
 | formatting.js:7:49:7:52 | evil | formatting.js:7:14:7:53 | require ... , evil) | provenance |  |
-| live-server.js:4:11:4:27 | tainted | live-server.js:6:28:6:34 | tainted | provenance |  |
-| live-server.js:4:21:4:27 | req.url | live-server.js:4:11:4:27 | tainted | provenance |  |
+| live-server.js:4:11:4:17 | tainted | live-server.js:6:28:6:34 | tainted | provenance |  |
+| live-server.js:4:21:4:27 | req.url | live-server.js:4:11:4:17 | tainted | provenance |  |
 | live-server.js:6:28:6:34 | tainted | live-server.js:6:13:6:50 | `<html> ... /html>` | provenance |  |
-| live-server.js:10:11:10:27 | tainted | live-server.js:12:28:12:34 | tainted | provenance |  |
-| live-server.js:10:21:10:27 | req.url | live-server.js:10:11:10:27 | tainted | provenance |  |
+| live-server.js:10:11:10:17 | tainted | live-server.js:12:28:12:34 | tainted | provenance |  |
+| live-server.js:10:21:10:27 | req.url | live-server.js:10:11:10:17 | tainted | provenance |  |
 | live-server.js:12:28:12:34 | tainted | live-server.js:12:13:12:50 | `<html> ... /html>` | provenance |  |
 | partial.js:9:25:9:25 | x | partial.js:10:14:10:14 | x | provenance |  |
 | partial.js:10:14:10:14 | x | partial.js:10:14:10:18 | x + y | provenance |  |
@@ -182,85 +182,85 @@ edges
 | promises.js:5:36:5:42 | [post update] resolve [resolve-value] | promises.js:5:16:5:22 | resolve [Return] [resolve-value] | provenance |  |
 | promises.js:5:44:5:57 | req.query.data | promises.js:5:36:5:42 | [post update] resolve [resolve-value] | provenance |  |
 | promises.js:6:11:6:11 | x | promises.js:6:25:6:25 | x | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:9:18:9:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:10:18:10:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:11:18:11:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:14:18:14:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:17:18:17:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:23:18:23:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:26:18:26:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:34:18:34:21 | data | provenance |  |
-| response-object.js:7:11:7:25 | data | response-object.js:38:18:38:21 | data | provenance |  |
-| response-object.js:7:18:7:25 | req.body | response-object.js:7:11:7:25 | data | provenance |  |
-| tst2.js:6:7:6:30 | p | tst2.js:7:12:7:12 | p | provenance |  |
-| tst2.js:6:7:6:30 | r | tst2.js:8:12:8:12 | r | provenance |  |
-| tst2.js:6:9:6:9 | p | tst2.js:6:7:6:30 | p | provenance |  |
-| tst2.js:6:12:6:15 | q: r | tst2.js:6:7:6:30 | r | provenance |  |
-| tst2.js:14:7:14:24 | p | tst2.js:18:12:18:12 | p | provenance |  |
-| tst2.js:14:7:14:24 | p | tst2.js:21:14:21:14 | p | provenance |  |
-| tst2.js:14:9:14:9 | p | tst2.js:14:7:14:24 | p | provenance |  |
-| tst2.js:30:7:30:24 | p | tst2.js:33:11:33:11 | p | provenance |  |
-| tst2.js:30:7:30:24 | p | tst2.js:36:12:36:12 | p | provenance |  |
-| tst2.js:30:9:30:9 | p | tst2.js:30:7:30:24 | p | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:9:18:9:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:10:18:10:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:11:18:11:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:14:18:14:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:17:18:17:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:23:18:23:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:26:18:26:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:34:18:34:21 | data | provenance |  |
+| response-object.js:7:11:7:14 | data | response-object.js:38:18:38:21 | data | provenance |  |
+| response-object.js:7:18:7:25 | req.body | response-object.js:7:11:7:14 | data | provenance |  |
+| tst2.js:6:9:6:9 | p | tst2.js:6:9:6:9 | p | provenance |  |
+| tst2.js:6:9:6:9 | p | tst2.js:7:12:7:12 | p | provenance |  |
+| tst2.js:6:12:6:15 | q: r | tst2.js:6:15:6:15 | r | provenance |  |
+| tst2.js:6:15:6:15 | r | tst2.js:8:12:8:12 | r | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:14:9:14:9 | p | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:18:12:18:12 | p | provenance |  |
+| tst2.js:14:9:14:9 | p | tst2.js:21:14:21:14 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:30:9:30:9 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:33:11:33:11 | p | provenance |  |
+| tst2.js:30:9:30:9 | p | tst2.js:36:12:36:12 | p | provenance |  |
 | tst2.js:33:3:33:5 | [post update] obj [p] | tst2.js:34:21:34:23 | obj [p] | provenance |  |
 | tst2.js:33:11:33:11 | p | tst2.js:33:3:33:5 | [post update] obj [p] | provenance |  |
-| tst2.js:34:7:34:24 | other [p] | tst2.js:37:12:37:16 | other [p] | provenance |  |
-| tst2.js:34:15:34:24 | clone(obj) [p] | tst2.js:34:7:34:24 | other [p] | provenance |  |
+| tst2.js:34:7:34:11 | other [p] | tst2.js:37:12:37:16 | other [p] | provenance |  |
+| tst2.js:34:15:34:24 | clone(obj) [p] | tst2.js:34:7:34:11 | other [p] | provenance |  |
 | tst2.js:34:21:34:23 | obj [p] | tst2.js:34:15:34:24 | clone(obj) [p] | provenance |  |
 | tst2.js:37:12:37:16 | other [p] | tst2.js:37:12:37:18 | other.p | provenance |  |
-| tst2.js:43:7:43:24 | p | tst2.js:49:36:49:36 | p | provenance |  |
-| tst2.js:43:9:43:9 | p | tst2.js:43:7:43:24 | p | provenance |  |
-| tst2.js:49:7:49:53 | unsafe | tst2.js:51:12:51:17 | unsafe | provenance |  |
-| tst2.js:49:16:49:53 | seriali ...  true}) | tst2.js:49:7:49:53 | unsafe | provenance |  |
+| tst2.js:43:9:43:9 | p | tst2.js:43:9:43:9 | p | provenance |  |
+| tst2.js:43:9:43:9 | p | tst2.js:49:36:49:36 | p | provenance |  |
+| tst2.js:49:7:49:12 | unsafe | tst2.js:51:12:51:17 | unsafe | provenance |  |
+| tst2.js:49:16:49:53 | seriali ...  true}) | tst2.js:49:7:49:12 | unsafe | provenance |  |
 | tst2.js:49:36:49:36 | p | tst2.js:49:16:49:53 | seriali ...  true}) | provenance |  |
-| tst2.js:57:7:57:24 | p | tst2.js:60:11:60:11 | p | provenance |  |
-| tst2.js:57:7:57:24 | p | tst2.js:63:12:63:12 | p | provenance |  |
-| tst2.js:57:9:57:9 | p | tst2.js:57:7:57:24 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:57:9:57:9 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:60:11:60:11 | p | provenance |  |
+| tst2.js:57:9:57:9 | p | tst2.js:63:12:63:12 | p | provenance |  |
 | tst2.js:60:3:60:5 | [post update] obj [p] | tst2.js:61:22:61:24 | obj [p] | provenance |  |
 | tst2.js:60:11:60:11 | p | tst2.js:60:3:60:5 | [post update] obj [p] | provenance |  |
-| tst2.js:61:7:61:25 | other [p] | tst2.js:64:12:64:16 | other [p] | provenance |  |
-| tst2.js:61:15:61:25 | fclone(obj) [p] | tst2.js:61:7:61:25 | other [p] | provenance |  |
+| tst2.js:61:7:61:11 | other [p] | tst2.js:64:12:64:16 | other [p] | provenance |  |
+| tst2.js:61:15:61:25 | fclone(obj) [p] | tst2.js:61:7:61:11 | other [p] | provenance |  |
 | tst2.js:61:22:61:24 | obj [p] | tst2.js:61:15:61:25 | fclone(obj) [p] | provenance |  |
 | tst2.js:64:12:64:16 | other [p] | tst2.js:64:12:64:18 | other.p | provenance |  |
-| tst2.js:69:7:69:24 | p | tst2.js:72:11:72:11 | p | provenance |  |
-| tst2.js:69:7:69:24 | p | tst2.js:75:12:75:12 | p | provenance |  |
-| tst2.js:69:9:69:9 | p | tst2.js:69:7:69:24 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:69:9:69:9 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:72:11:72:11 | p | provenance |  |
+| tst2.js:69:9:69:9 | p | tst2.js:75:12:75:12 | p | provenance |  |
 | tst2.js:72:3:72:5 | [post update] obj [p] | tst2.js:73:40:73:42 | obj [p] | provenance |  |
 | tst2.js:72:11:72:11 | p | tst2.js:72:3:72:5 | [post update] obj [p] | provenance |  |
-| tst2.js:73:7:73:44 | other [p] | tst2.js:76:12:76:16 | other [p] | provenance |  |
-| tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | tst2.js:73:7:73:44 | other [p] | provenance |  |
+| tst2.js:73:7:73:11 | other [p] | tst2.js:76:12:76:16 | other [p] | provenance |  |
+| tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | tst2.js:73:7:73:11 | other [p] | provenance |  |
 | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | provenance |  |
 | tst2.js:73:40:73:42 | obj [p] | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | provenance |  |
 | tst2.js:76:12:76:16 | other [p] | tst2.js:76:12:76:18 | other.p | provenance |  |
-| tst2.js:82:7:82:24 | p | tst2.js:85:11:85:11 | p | provenance |  |
-| tst2.js:82:7:82:24 | p | tst2.js:88:12:88:12 | p | provenance |  |
-| tst2.js:82:9:82:9 | p | tst2.js:82:7:82:24 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:82:9:82:9 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:85:11:85:11 | p | provenance |  |
+| tst2.js:82:9:82:9 | p | tst2.js:88:12:88:12 | p | provenance |  |
 | tst2.js:85:3:85:5 | [post update] obj [p] | tst2.js:86:24:86:26 | obj [p] | provenance |  |
 | tst2.js:85:11:85:11 | p | tst2.js:85:3:85:5 | [post update] obj [p] | provenance |  |
-| tst2.js:86:7:86:27 | other [p] | tst2.js:89:12:89:16 | other [p] | provenance |  |
-| tst2.js:86:15:86:27 | sortKeys(obj) [p] | tst2.js:86:7:86:27 | other [p] | provenance |  |
+| tst2.js:86:7:86:11 | other [p] | tst2.js:89:12:89:16 | other [p] | provenance |  |
+| tst2.js:86:15:86:27 | sortKeys(obj) [p] | tst2.js:86:7:86:11 | other [p] | provenance |  |
 | tst2.js:86:24:86:26 | obj [p] | tst2.js:86:15:86:27 | sortKeys(obj) [p] | provenance |  |
 | tst2.js:89:12:89:16 | other [p] | tst2.js:89:12:89:18 | other.p | provenance |  |
-| tst2.js:93:7:93:24 | p | tst2.js:99:51:99:51 | p | provenance |  |
-| tst2.js:93:9:93:9 | p | tst2.js:93:7:93:24 | p | provenance |  |
-| tst2.js:99:7:99:69 | unsafe | tst2.js:101:12:101:17 | unsafe | provenance |  |
-| tst2.js:99:16:99:69 | seriali ...  true}) | tst2.js:99:7:99:69 | unsafe | provenance |  |
+| tst2.js:93:9:93:9 | p | tst2.js:93:9:93:9 | p | provenance |  |
+| tst2.js:93:9:93:9 | p | tst2.js:99:51:99:51 | p | provenance |  |
+| tst2.js:99:7:99:12 | unsafe | tst2.js:101:12:101:17 | unsafe | provenance |  |
+| tst2.js:99:16:99:69 | seriali ...  true}) | tst2.js:99:7:99:12 | unsafe | provenance |  |
 | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | tst2.js:99:16:99:69 | seriali ...  true}) | provenance |  |
 | tst2.js:99:51:99:51 | p | tst2.js:99:16:99:69 | seriali ...  true}) | provenance |  |
 | tst2.js:99:51:99:51 | p | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | provenance |  |
-| tst2.js:105:7:105:24 | p | tst2.js:110:28:110:28 | p | provenance |  |
-| tst2.js:105:9:105:9 | p | tst2.js:105:7:105:24 | p | provenance |  |
-| tst2.js:110:7:110:29 | obj [someProperty] | tst2.js:111:36:111:38 | obj [someProperty] | provenance |  |
-| tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | tst2.js:110:7:110:29 | obj [someProperty] | provenance |  |
+| tst2.js:105:9:105:9 | p | tst2.js:105:9:105:9 | p | provenance |  |
+| tst2.js:105:9:105:9 | p | tst2.js:110:28:110:28 | p | provenance |  |
+| tst2.js:110:7:110:9 | obj [someProperty] | tst2.js:111:36:111:38 | obj [someProperty] | provenance |  |
+| tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | tst2.js:110:7:110:9 | obj [someProperty] | provenance |  |
 | tst2.js:110:28:110:28 | p | tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | provenance |  |
 | tst2.js:110:28:110:28 | p | tst2.js:111:16:111:55 | seriali ...  true}) | provenance |  |
-| tst2.js:111:7:111:55 | unsafe | tst2.js:113:12:113:17 | unsafe | provenance |  |
-| tst2.js:111:16:111:55 | seriali ...  true}) | tst2.js:111:7:111:55 | unsafe | provenance |  |
+| tst2.js:111:7:111:12 | unsafe | tst2.js:113:12:113:17 | unsafe | provenance |  |
+| tst2.js:111:16:111:55 | seriali ...  true}) | tst2.js:111:7:111:12 | unsafe | provenance |  |
 | tst2.js:111:36:111:38 | obj [someProperty] | tst2.js:111:16:111:55 | seriali ...  true}) | provenance |  |
-| tst3.js:5:7:5:24 | p | tst3.js:6:12:6:12 | p | provenance |  |
-| tst3.js:5:9:5:9 | p | tst3.js:5:7:5:24 | p | provenance |  |
-| tst3.js:11:9:11:74 | code | tst3.js:12:12:12:15 | code | provenance |  |
-| tst3.js:11:16:11:74 | prettie ... bel" }) | tst3.js:11:9:11:74 | code | provenance |  |
+| tst3.js:5:9:5:9 | p | tst3.js:5:9:5:9 | p | provenance |  |
+| tst3.js:5:9:5:9 | p | tst3.js:6:12:6:12 | p | provenance |  |
+| tst3.js:11:9:11:12 | code | tst3.js:12:12:12:15 | code | provenance |  |
+| tst3.js:11:16:11:74 | prettie ... bel" }) | tst3.js:11:9:11:12 | code | provenance |  |
 | tst3.js:11:32:11:39 | reg.body | tst3.js:11:16:11:74 | prettie ... bel" }) | provenance |  |
 nodes
 | ReflectedXss.js:7:14:7:45 | "Unknow ... rams.id | semmle.label | "Unknow ... rams.id |
@@ -271,7 +271,7 @@ nodes
 | 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:7:29:13 | mytable | semmle.label | mytable |
 | ReflectedXss.js:29:17:32:4 | table([ ... ce\\n  ]) | semmle.label | table([ ... ce\\n  ]) |
 | ReflectedXss.js:29:23:32:3 | [\\n    [ ... rce\\n  ] [1, 1] | semmle.label | [\\n    [ ... rce\\n  ] [1, 1] |
 | ReflectedXss.js:31:5:31:22 | ['body', req.body] [1] | semmle.label | ['body', req.body] [1] |
@@ -306,18 +306,18 @@ nodes
 | 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:113:19:113:27 | queryKeys | semmle.label | queryKeys |
+| ReflectedXss.js:115:11:115:14 | 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:11:117:18 | keyArray | semmle.label | keyArray |
+| ReflectedXss.js:117:11:117:18 | 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:11:118:21 | invalidKeys | semmle.label | invalidKeys |
+| ReflectedXss.js:118:11:118:21 | 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)) |
@@ -335,8 +335,8 @@ nodes
 | ReflectedXssContentTypes.js:70:12:70:34 | "FOO: " ... rams.id | semmle.label | "FOO: " ... rams.id |
 | ReflectedXssContentTypes.js:70:22:70:34 | req.params.id | semmle.label | req.params.id |
 | ReflectedXssGood3.js:68:22:68:26 | value | semmle.label | value |
-| ReflectedXssGood3.js:77:7:77:37 | parts | semmle.label | parts |
-| ReflectedXssGood3.js:77:7:77:37 | parts [0] | semmle.label | parts [0] |
+| ReflectedXssGood3.js:77:7:77:11 | parts | semmle.label | parts |
+| ReflectedXssGood3.js:77:7:77:11 | parts [0] | semmle.label | parts [0] |
 | ReflectedXssGood3.js:77:15:77:37 | [value. ... (0, i)] [0] | semmle.label | [value. ... (0, i)] [0] |
 | ReflectedXssGood3.js:77:16:77:20 | value | semmle.label | value |
 | ReflectedXssGood3.js:77:16:77:36 | value.s ... g(0, i) | semmle.label | value.s ... g(0, i) |
@@ -347,38 +347,38 @@ nodes
 | ReflectedXssGood3.js:108:10:108:14 | parts [0] | semmle.label | parts [0] |
 | ReflectedXssGood3.js:108:10:108:14 | parts [ArrayElement] | semmle.label | parts [ArrayElement] |
 | ReflectedXssGood3.js:108:10:108:23 | parts.join('') | semmle.label | parts.join('') |
-| ReflectedXssGood3.js:135:9:135:27 | url | semmle.label | url |
+| ReflectedXssGood3.js:135:9:135:11 | url | semmle.label | url |
 | ReflectedXssGood3.js:135:15:135:27 | req.params.id | semmle.label | req.params.id |
 | ReflectedXssGood3.js:139:12:139:27 | escapeHtml3(url) | semmle.label | escapeHtml3(url) |
 | ReflectedXssGood3.js:139:24:139:26 | url | semmle.label | url |
-| app/api/route.ts:2:11:2:33 | body | semmle.label | body |
+| app/api/route.ts:2:11:2:14 | body | semmle.label | body |
 | app/api/route.ts:2:18:2:33 | await req.json() | semmle.label | await req.json() |
 | app/api/route.ts:2:24:2:33 | req.json() | semmle.label | req.json() |
 | app/api/route.ts:5:18:5:21 | body | semmle.label | body |
 | app/api/route.ts:13:18:13:21 | body | semmle.label | body |
 | app/api/route.ts:25:18:25:21 | body | semmle.label | body |
 | app/api/route.ts:29:25:29:28 | body | semmle.label | body |
-| app/api/routeNextRequest.ts:4:9:4:31 | body | semmle.label | body |
+| app/api/routeNextRequest.ts:4:9:4:12 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:4:16:4:31 | await req.json() | semmle.label | await req.json() |
 | app/api/routeNextRequest.ts:4:22:4:31 | req.json() | semmle.label | req.json() |
 | app/api/routeNextRequest.ts:7:20:7:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:15:20:15:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:27:20:27:23 | body | semmle.label | body |
 | app/api/routeNextRequest.ts:31:27:31:30 | body | semmle.label | body |
-| etherpad.js:9:5:9:53 | response | semmle.label | response |
+| etherpad.js:9:5:9:12 | response | semmle.label | response |
 | etherpad.js:9:16:9:30 | req.query.jsonp | semmle.label | req.query.jsonp |
 | etherpad.js:11:12:11:19 | response | semmle.label | response |
-| formatting.js:4:9:4:29 | evil | semmle.label | evil |
+| formatting.js:4:9:4:12 | evil | semmle.label | evil |
 | formatting.js:4:16:4:29 | req.query.evil | semmle.label | req.query.evil |
 | formatting.js:6:14:6:47 | util.fo ... , evil) | semmle.label | util.fo ... , evil) |
 | formatting.js:6:43:6:46 | evil | semmle.label | evil |
 | formatting.js:7:14:7:53 | require ... , evil) | semmle.label | require ... , evil) |
 | formatting.js:7:49:7:52 | evil | semmle.label | evil |
-| live-server.js:4:11:4:27 | tainted | semmle.label | tainted |
+| live-server.js:4:11:4:17 | tainted | semmle.label | tainted |
 | live-server.js:4:21:4:27 | req.url | semmle.label | req.url |
 | live-server.js:6:13:6:50 | `<html> ... /html>` | semmle.label | `<html> ... /html>` |
 | live-server.js:6:28:6:34 | tainted | semmle.label | tainted |
-| live-server.js:10:11:10:27 | tainted | semmle.label | tainted |
+| live-server.js:10:11:10:17 | tainted | semmle.label | tainted |
 | live-server.js:10:21:10:27 | req.url | semmle.label | req.url |
 | live-server.js:12:13:12:50 | `<html> ... /html>` | semmle.label | `<html> ... /html>` |
 | live-server.js:12:28:12:34 | tainted | semmle.label | tainted |
@@ -407,7 +407,7 @@ nodes
 | promises.js:5:44:5:57 | req.query.data | semmle.label | req.query.data |
 | promises.js:6:11:6:11 | x | semmle.label | x |
 | promises.js:6:25:6:25 | x | semmle.label | x |
-| response-object.js:7:11:7:25 | data | semmle.label | data |
+| response-object.js:7:11:7:14 | data | semmle.label | data |
 | response-object.js:7:18:7:25 | req.body | semmle.label | req.body |
 | response-object.js:9:18:9:21 | data | semmle.label | data |
 | response-object.js:10:18:10:21 | data | semmle.label | data |
@@ -418,83 +418,83 @@ nodes
 | response-object.js:26:18:26:21 | data | semmle.label | data |
 | response-object.js:34:18:34:21 | data | semmle.label | data |
 | response-object.js:38:18:38:21 | data | semmle.label | data |
-| tst2.js:6:7:6:30 | p | semmle.label | p |
-| tst2.js:6:7:6:30 | r | semmle.label | r |
+| tst2.js:6:9:6:9 | p | semmle.label | p |
 | tst2.js:6:9:6:9 | p | semmle.label | p |
 | tst2.js:6:12:6:15 | q: r | semmle.label | q: r |
+| tst2.js:6:15:6:15 | r | semmle.label | r |
 | tst2.js:7:12:7:12 | p | semmle.label | p |
 | tst2.js:8:12:8:12 | r | semmle.label | r |
-| tst2.js:14:7:14:24 | p | semmle.label | p |
+| tst2.js:14:9:14:9 | p | semmle.label | p |
 | tst2.js:14:9:14:9 | p | semmle.label | p |
 | tst2.js:18:12:18:12 | p | semmle.label | p |
 | tst2.js:21:14:21:14 | p | semmle.label | p |
-| tst2.js:30:7:30:24 | p | semmle.label | p |
+| tst2.js:30:9:30:9 | p | semmle.label | p |
 | tst2.js:30:9:30:9 | p | semmle.label | p |
 | tst2.js:33:3:33:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:33:11:33:11 | p | semmle.label | p |
-| tst2.js:34:7:34:24 | other [p] | semmle.label | other [p] |
+| tst2.js:34:7:34:11 | other [p] | semmle.label | other [p] |
 | tst2.js:34:15:34:24 | clone(obj) [p] | semmle.label | clone(obj) [p] |
 | tst2.js:34:21:34:23 | obj [p] | semmle.label | obj [p] |
 | tst2.js:36:12:36:12 | p | semmle.label | p |
 | tst2.js:37:12:37:16 | other [p] | semmle.label | other [p] |
 | tst2.js:37:12:37:18 | other.p | semmle.label | other.p |
-| tst2.js:43:7:43:24 | p | semmle.label | p |
 | tst2.js:43:9:43:9 | p | semmle.label | p |
-| tst2.js:49:7:49:53 | unsafe | semmle.label | unsafe |
+| tst2.js:43:9:43:9 | p | semmle.label | p |
+| tst2.js:49:7:49:12 | unsafe | semmle.label | unsafe |
 | tst2.js:49:16:49:53 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:49:36:49:36 | p | semmle.label | p |
 | tst2.js:51:12:51:17 | unsafe | semmle.label | unsafe |
-| tst2.js:57:7:57:24 | p | semmle.label | p |
+| tst2.js:57:9:57:9 | p | semmle.label | p |
 | tst2.js:57:9:57:9 | p | semmle.label | p |
 | tst2.js:60:3:60:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:60:11:60:11 | p | semmle.label | p |
-| tst2.js:61:7:61:25 | other [p] | semmle.label | other [p] |
+| tst2.js:61:7:61:11 | other [p] | semmle.label | other [p] |
 | tst2.js:61:15:61:25 | fclone(obj) [p] | semmle.label | fclone(obj) [p] |
 | tst2.js:61:22:61:24 | obj [p] | semmle.label | obj [p] |
 | tst2.js:63:12:63:12 | p | semmle.label | p |
 | tst2.js:64:12:64:16 | other [p] | semmle.label | other [p] |
 | tst2.js:64:12:64:18 | other.p | semmle.label | other.p |
-| tst2.js:69:7:69:24 | p | semmle.label | p |
+| tst2.js:69:9:69:9 | p | semmle.label | p |
 | tst2.js:69:9:69:9 | p | semmle.label | p |
 | tst2.js:72:3:72:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:72:11:72:11 | p | semmle.label | p |
-| tst2.js:73:7:73:44 | other [p] | semmle.label | other [p] |
+| tst2.js:73:7:73:11 | other [p] | semmle.label | other [p] |
 | tst2.js:73:15:73:44 | jc.retr ... e(obj)) [p] | semmle.label | jc.retr ... e(obj)) [p] |
 | tst2.js:73:29:73:43 | jc.decycle(obj) [p] | semmle.label | jc.decycle(obj) [p] |
 | tst2.js:73:40:73:42 | obj [p] | semmle.label | obj [p] |
 | tst2.js:75:12:75:12 | p | semmle.label | p |
 | tst2.js:76:12:76:16 | other [p] | semmle.label | other [p] |
 | tst2.js:76:12:76:18 | other.p | semmle.label | other.p |
-| tst2.js:82:7:82:24 | p | semmle.label | p |
+| tst2.js:82:9:82:9 | p | semmle.label | p |
 | tst2.js:82:9:82:9 | p | semmle.label | p |
 | tst2.js:85:3:85:5 | [post update] obj [p] | semmle.label | [post update] obj [p] |
 | tst2.js:85:11:85:11 | p | semmle.label | p |
-| tst2.js:86:7:86:27 | other [p] | semmle.label | other [p] |
+| tst2.js:86:7:86:11 | other [p] | semmle.label | other [p] |
 | tst2.js:86:15:86:27 | sortKeys(obj) [p] | semmle.label | sortKeys(obj) [p] |
 | tst2.js:86:24:86:26 | obj [p] | semmle.label | obj [p] |
 | tst2.js:88:12:88:12 | p | semmle.label | p |
 | tst2.js:89:12:89:16 | other [p] | semmle.label | other [p] |
 | tst2.js:89:12:89:18 | other.p | semmle.label | other.p |
-| tst2.js:93:7:93:24 | p | semmle.label | p |
 | tst2.js:93:9:93:9 | p | semmle.label | p |
-| tst2.js:99:7:99:69 | unsafe | semmle.label | unsafe |
+| tst2.js:93:9:93:9 | p | semmle.label | p |
+| tst2.js:99:7:99:12 | unsafe | semmle.label | unsafe |
 | tst2.js:99:16:99:69 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:99:36:99:52 | {someProperty: p} [someProperty] | semmle.label | {someProperty: p} [someProperty] |
 | tst2.js:99:51:99:51 | p | semmle.label | p |
 | tst2.js:101:12:101:17 | unsafe | semmle.label | unsafe |
-| tst2.js:105:7:105:24 | p | semmle.label | p |
 | tst2.js:105:9:105:9 | p | semmle.label | p |
-| tst2.js:110:7:110:29 | obj [someProperty] | semmle.label | obj [someProperty] |
+| tst2.js:105:9:105:9 | p | semmle.label | p |
+| tst2.js:110:7:110:9 | obj [someProperty] | semmle.label | obj [someProperty] |
 | tst2.js:110:13:110:29 | {someProperty: p} [someProperty] | semmle.label | {someProperty: p} [someProperty] |
 | tst2.js:110:28:110:28 | p | semmle.label | p |
-| tst2.js:111:7:111:55 | unsafe | semmle.label | unsafe |
+| tst2.js:111:7:111:12 | unsafe | semmle.label | unsafe |
 | tst2.js:111:16:111:55 | seriali ...  true}) | semmle.label | seriali ...  true}) |
 | tst2.js:111:36:111:38 | obj [someProperty] | semmle.label | obj [someProperty] |
 | tst2.js:113:12:113:17 | unsafe | semmle.label | unsafe |
-| tst3.js:5:7:5:24 | p | semmle.label | p |
+| tst3.js:5:9:5:9 | p | semmle.label | p |
 | tst3.js:5:9:5:9 | p | semmle.label | p |
 | tst3.js:6:12:6:12 | p | semmle.label | p |
-| tst3.js:11:9:11:74 | code | semmle.label | code |
+| tst3.js:11:9:11:12 | code | semmle.label | code |
 | tst3.js:11:16:11:74 | prettie ... bel" }) | semmle.label | prettie ... bel" }) |
 | tst3.js:11:32:11:39 | reg.body | semmle.label | reg.body |
 | tst3.js:12:12:12:15 | code | semmle.label | code |
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 a2bcd0163fde..26f888fa0bab 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
@@ -22,12 +22,12 @@ edges
 | xss-through-filenames.js:30:34:30:37 | file | xss-through-filenames.js:31:25:31:28 | file | provenance |  |
 | xss-through-filenames.js:31:25:31:28 | file | xss-through-filenames.js:31:13:31:18 | [post update] files2 [ArrayElement] | provenance |  |
 | xss-through-filenames.js:33:19:33:24 | files2 [ArrayElement] | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | provenance |  |
-| xss-through-filenames.js:35:13:35:35 | files3 | xss-through-filenames.js:37:19:37:24 | files3 | provenance |  |
-| xss-through-filenames.js:35:22:35:35 | format(files2) | xss-through-filenames.js:35:13:35:35 | files3 | provenance |  |
+| xss-through-filenames.js:35:13:35:18 | files3 | xss-through-filenames.js:37:19:37:24 | files3 | provenance |  |
+| xss-through-filenames.js:35:22:35:35 | format(files2) | xss-through-filenames.js:35:13:35:18 | files3 | provenance |  |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | xss-through-filenames.js:17:21:17:26 | files2 [ArrayElement] | provenance |  |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | xss-through-filenames.js:35:22:35:35 | format(files2) | provenance |  |
-| xss-through-torrent.js:6:6:6:24 | name | xss-through-torrent.js:7:11:7:14 | name | provenance |  |
-| xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:6:6:6:24 | name | provenance |  |
+| xss-through-torrent.js:6:6:6:9 | name | xss-through-torrent.js:7:11:7:14 | name | provenance |  |
+| xss-through-torrent.js:6:13:6:24 | torrent.name | xss-through-torrent.js:6:6:6:9 | name | provenance |  |
 nodes
 | xss-through-filenames.js:7:43:7:48 | files1 | semmle.label | files1 |
 | xss-through-filenames.js:8:18:8:23 | files1 | semmle.label | files1 |
@@ -48,11 +48,11 @@ nodes
 | xss-through-filenames.js:31:25:31:28 | file | semmle.label | file |
 | xss-through-filenames.js:33:19:33:24 | files2 | semmle.label | files2 |
 | xss-through-filenames.js:33:19:33:24 | files2 [ArrayElement] | semmle.label | files2 [ArrayElement] |
-| xss-through-filenames.js:35:13:35:35 | files3 | semmle.label | files3 |
+| xss-through-filenames.js:35:13:35:18 | files3 | semmle.label | files3 |
 | xss-through-filenames.js:35:22:35:35 | format(files2) | semmle.label | format(files2) |
 | xss-through-filenames.js:35:29:35:34 | files2 [ArrayElement] | semmle.label | files2 [ArrayElement] |
 | xss-through-filenames.js:37:19:37:24 | files3 | semmle.label | files3 |
-| xss-through-torrent.js:6:6:6:24 | name | semmle.label | name |
+| xss-through-torrent.js:6:6:6:9 | name | semmle.label | name |
 | xss-through-torrent.js:6:13:6:24 | torrent.name | semmle.label | torrent.name |
 | xss-through-torrent.js:7:11:7:14 | name | semmle.label | name |
 subpaths
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 4f757d1a9313..63bdfa1bcf23 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
@@ -29,11 +29,11 @@ edges
 | 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:9:13:12 | 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/index.ts:13:16:13:41 | setting ... i].name | lib2/index.ts:13:9:13:12 | 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 |  |
@@ -41,12 +41,12 @@ edges
 | 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:57:11:57:18 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:11:57:18 | defaults | main.js:60:31:60:38 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:57:18 | defaults | provenance |  |
+| main.js:57:22:59:5 | {\\n      ... "\\n    } | main.js:57:11:57:18 | defaults | provenance |  |
+| main.js:60:11:60:18 | settings | main.js:62:19:62:26 | settings | provenance |  |
+| main.js:60:22:60:48 | $.exten ... ptions) | main.js:60:11:60:18 | 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 |
@@ -78,7 +78,7 @@ nodes
 | lib2/index.ts:2:27:2:27 | s | semmle.label | s |
 | lib2/index.ts:6:29:6:36 | settings | semmle.label | settings |
 | lib2/index.ts:7:58:7:65 | settings | semmle.label | settings |
-| lib2/index.ts:13:9:13:41 | name | semmle.label | name |
+| lib2/index.ts:13:9:13:12 | name | semmle.label | name |
 | lib2/index.ts:13:16:13:23 | settings | semmle.label | settings |
 | lib2/index.ts:13:16:13:33 | settings.mySetting | semmle.label | settings.mySetting |
 | lib2/index.ts:13:16:13:36 | setting ... ting[i] | semmle.label | setting ... ting[i] |
@@ -97,11 +97,11 @@ nodes
 | main.js:21:47:21:47 | s | semmle.label | s |
 | main.js:22:34:22:34 | s | semmle.label | s |
 | main.js:56:28:56:34 | options | semmle.label | options |
-| main.js:57:11:59:5 | defaults | semmle.label | defaults |
-| main.js:57:11:59:5 | defaults | semmle.label | defaults |
+| main.js:57:11:57:18 | defaults | semmle.label | defaults |
+| main.js:57:11:57:18 | defaults | semmle.label | defaults |
 | main.js:57:22:59:5 | {\\n      ... "\\n    } | semmle.label | {\\n      ... "\\n    } |
 | main.js:57:22:59:5 | {\\n      ... "\\n    } | semmle.label | {\\n      ... "\\n    } |
-| main.js:60:11:60:48 | settings | semmle.label | settings |
+| main.js:60:11:60:18 | settings | semmle.label | settings |
 | main.js:60:22:60:48 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | main.js:60:31:60:38 | defaults | semmle.label | defaults |
 | main.js:60:31:60:38 | defaults | semmle.label | defaults |
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 236f3b387fa5..563f8b52d9c6 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
@@ -32,15 +32,15 @@ edges
 | unsafe-jquery-plugin.js:5:5:5:18 | options.target | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance | Config |
 | unsafe-jquery-plugin.js:7:17:7:23 | options | unsafe-jquery-plugin.js:7:17:7:30 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:7:17:7:30 | options.target | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance | Config |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:22:6:22:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:30:6:30:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:36:6:36:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:40:6:40:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:48:6:48:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:52:6:52:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | unsafe-jquery-plugin.js:60:6:60:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:22:6:22:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:30:6:30:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:36:6:36:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:40:6:40:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:48:6:48:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:52:6:52:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | unsafe-jquery-plugin.js:60:6:60:11 | target | provenance |  |
 | unsafe-jquery-plugin.js:11:16:11:22 | options | unsafe-jquery-plugin.js:11:16:11:29 | options.target | provenance |  |
-| unsafe-jquery-plugin.js:11:16:11:29 | options.target | unsafe-jquery-plugin.js:11:7:11:29 | target | provenance |  |
+| unsafe-jquery-plugin.js:11:16:11:29 | options.target | unsafe-jquery-plugin.js:11:7:11:12 | target | provenance |  |
 | unsafe-jquery-plugin.js:65:47:65:53 | options | unsafe-jquery-plugin.js:67:37:67:43 | options | provenance |  |
 | unsafe-jquery-plugin.js:67:3:67:6 | [post update] this [options] | unsafe-jquery-plugin.js:68:7:68:10 | this [options] | provenance |  |
 | unsafe-jquery-plugin.js:67:24:67:44 | $.exten ... ptions) | unsafe-jquery-plugin.js:67:3:67:6 | [post update] this [options] | provenance |  |
@@ -57,18 +57,18 @@ edges
 | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | provenance |  |
 | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | provenance |  |
 | unsafe-jquery-plugin.js:86:26:86:26 | o | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | provenance |  |
-| unsafe-jquery-plugin.js:87:8:87:24 | t | unsafe-jquery-plugin.js:90:6:90:6 | t | provenance |  |
+| unsafe-jquery-plugin.js:87:8:87:8 | t | unsafe-jquery-plugin.js:90:6:90:6 | t | provenance |  |
 | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | unsafe-jquery-plugin.js:87:12:87:17 | this.o | provenance |  |
-| unsafe-jquery-plugin.js:87:12:87:17 | this.o | unsafe-jquery-plugin.js:87:8:87:24 | t | provenance |  |
+| unsafe-jquery-plugin.js:87:12:87:17 | this.o | unsafe-jquery-plugin.js:87:8:87:8 | t | provenance |  |
 | unsafe-jquery-plugin.js:92:5:92:11 | options | unsafe-jquery-plugin.js:85:14:85:14 | o | provenance |  |
 | unsafe-jquery-plugin.js:101:38:101:44 | options | unsafe-jquery-plugin.js:105:6:105:12 | options | provenance |  |
-| unsafe-jquery-plugin.js:102:3:105:13 | options | unsafe-jquery-plugin.js:107:5:107:11 | options | provenance |  |
-| unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | unsafe-jquery-plugin.js:102:3:105:13 | options | provenance |  |
+| unsafe-jquery-plugin.js:102:3:102:9 | options | unsafe-jquery-plugin.js:107:5:107:11 | options | provenance |  |
+| unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | unsafe-jquery-plugin.js:102:3:102:9 | options | provenance |  |
 | unsafe-jquery-plugin.js:105:6:105:12 | options | unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | provenance |  |
 | unsafe-jquery-plugin.js:107:5:107:11 | options | unsafe-jquery-plugin.js:107:5:107:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:114:38:114:44 | options | unsafe-jquery-plugin.js:115:51:115:57 | options | provenance |  |
-| unsafe-jquery-plugin.js:115:3:115:58 | options | unsafe-jquery-plugin.js:117:5:117:11 | options | provenance |  |
-| unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | unsafe-jquery-plugin.js:115:3:115:58 | options | provenance |  |
+| unsafe-jquery-plugin.js:115:3:115:9 | options | unsafe-jquery-plugin.js:117:5:117:11 | options | provenance |  |
+| unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | unsafe-jquery-plugin.js:115:3:115:9 | options | provenance |  |
 | unsafe-jquery-plugin.js:115:51:115:57 | options | unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | provenance |  |
 | unsafe-jquery-plugin.js:117:5:117:11 | options | unsafe-jquery-plugin.js:117:5:117:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:121:40:121:46 | options | unsafe-jquery-plugin.js:122:5:122:11 | options | provenance |  |
@@ -90,8 +90,8 @@ edges
 | unsafe-jquery-plugin.js:157:44:157:50 | options | unsafe-jquery-plugin.js:157:44:157:57 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:157:44:157:57 | options.target | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | provenance |  |
 | unsafe-jquery-plugin.js:160:38:160:44 | options | unsafe-jquery-plugin.js:165:16:165:22 | options | provenance |  |
-| unsafe-jquery-plugin.js:165:7:165:29 | target | unsafe-jquery-plugin.js:170:6:170:11 | target | provenance |  |
-| unsafe-jquery-plugin.js:165:16:165:22 | options | unsafe-jquery-plugin.js:165:7:165:29 | target | provenance |  |
+| unsafe-jquery-plugin.js:165:7:165:12 | target | unsafe-jquery-plugin.js:170:6:170:11 | target | provenance |  |
+| unsafe-jquery-plugin.js:165:16:165:22 | options | unsafe-jquery-plugin.js:165:7:165:12 | target | provenance |  |
 | unsafe-jquery-plugin.js:178:27:178:33 | options | unsafe-jquery-plugin.js:179:5:179:11 | options | provenance |  |
 | unsafe-jquery-plugin.js:179:5:179:11 | options | unsafe-jquery-plugin.js:179:5:179:18 | options.target | provenance |  |
 | unsafe-jquery-plugin.js:185:28:185:34 | options | unsafe-jquery-plugin.js:186:21:186:27 | options | provenance |  |
@@ -105,7 +105,7 @@ nodes
 | unsafe-jquery-plugin.js:5:5:5:18 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:7:17:7:23 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:7:17:7:30 | options.target | semmle.label | options.target |
-| unsafe-jquery-plugin.js:11:7:11:29 | target | semmle.label | target |
+| unsafe-jquery-plugin.js:11:7:11:12 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:11:16:11:22 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:11:16:11:29 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:22:6:22:11 | target | semmle.label | target |
@@ -134,19 +134,19 @@ nodes
 | unsafe-jquery-plugin.js:86:4:86:7 | [post update] this [o] | semmle.label | [post update] this [o] |
 | unsafe-jquery-plugin.js:86:13:86:27 | $.extend({}, o) | semmle.label | $.extend({}, o) |
 | unsafe-jquery-plugin.js:86:26:86:26 | o | semmle.label | o |
-| unsafe-jquery-plugin.js:87:8:87:24 | t | semmle.label | t |
+| unsafe-jquery-plugin.js:87:8:87:8 | t | semmle.label | t |
 | unsafe-jquery-plugin.js:87:12:87:15 | this [o] | semmle.label | this [o] |
 | unsafe-jquery-plugin.js:87:12:87:17 | this.o | semmle.label | this.o |
 | unsafe-jquery-plugin.js:90:6:90:6 | t | semmle.label | t |
 | unsafe-jquery-plugin.js:92:5:92:11 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:101:38:101:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:102:3:105:13 | options | semmle.label | options |
+| unsafe-jquery-plugin.js:102:3:102:9 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:102:13:105:13 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | unsafe-jquery-plugin.js:105:6:105:12 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:107:5:107:11 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:107:5:107:18 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:114:38:114:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:115:3:115:58 | options | semmle.label | options |
+| unsafe-jquery-plugin.js:115:3:115:9 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:115:13:115:58 | $.exten ... ptions) | semmle.label | $.exten ... ptions) |
 | unsafe-jquery-plugin.js:115:51:115:57 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:117:5:117:11 | options | semmle.label | options |
@@ -172,7 +172,7 @@ nodes
 | unsafe-jquery-plugin.js:157:44:157:57 | options.target | semmle.label | options.target |
 | unsafe-jquery-plugin.js:157:44:157:59 | options.target.a | semmle.label | options.target.a |
 | unsafe-jquery-plugin.js:160:38:160:44 | options | semmle.label | options |
-| unsafe-jquery-plugin.js:165:7:165:29 | target | semmle.label | target |
+| unsafe-jquery-plugin.js:165:7:165:12 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:165:16:165:22 | options | semmle.label | options |
 | unsafe-jquery-plugin.js:170:6:170:11 | target | semmle.label | target |
 | unsafe-jquery-plugin.js:178:27:178:33 | options | semmle.label | options |
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 6f2eed5b1393..fe0ee6ea7881 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
@@ -58,38 +58,38 @@ edges
 | forms.js:25:23:25:28 | values | forms.js:25:23:25:34 | values.email | provenance |  |
 | forms.js:28:20:28:25 | values | forms.js:29:23:29:28 | values | provenance |  |
 | forms.js:29:23:29:28 | values | forms.js:29:23:29:34 | values.email | provenance |  |
-| forms.js:34:11:34:53 | values | forms.js:35:19:35:24 | values | provenance |  |
-| forms.js:34:13:34:18 | values | forms.js:34:11:34:53 | values | provenance |  |
+| forms.js:34:13:34:18 | values | forms.js:34:13:34:18 | values | provenance |  |
+| forms.js:34:13:34:18 | values | forms.js:35:19:35:24 | values | provenance |  |
 | forms.js:35:19:35:24 | values | forms.js:35:19:35:30 | values.email | provenance |  |
 | forms.js:44:21:44:26 | values | forms.js:45:21:45:26 | values | provenance |  |
 | forms.js:45:21:45:26 | values | forms.js:45:21:45:33 | values.stooge | provenance |  |
 | forms.js:71:21:71:24 | data | forms.js:72:19:72:22 | data | provenance |  |
 | forms.js:72:19:72:22 | data | forms.js:72:19:72:27 | data.name | provenance |  |
-| forms.js:92:17:92:36 | values | forms.js:93:25:93:30 | values | provenance |  |
-| forms.js:92:26:92:36 | getValues() | forms.js:92:17:92:36 | values | provenance |  |
+| forms.js:92:17:92:22 | values | forms.js:93:25:93:30 | values | provenance |  |
+| forms.js:92:26:92:36 | getValues() | forms.js:92:17:92:22 | values | provenance |  |
 | forms.js:93:25:93:30 | values | forms.js:93:25:93:35 | values.name | provenance |  |
-| xss-through-dom.js:73:9:73:41 | selector | xss-through-dom.js:77:4:77:11 | selector | provenance |  |
-| xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:73:9:73:41 | selector | provenance |  |
-| xss-through-dom.js:84:8:84:30 | text | xss-through-dom.js:86:33:86:36 | text | provenance |  |
-| xss-through-dom.js:84:8:84:30 | text | xss-through-dom.js:87:36:87:39 | text | provenance |  |
-| xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:84:8:84:30 | text | provenance |  |
+| xss-through-dom.js:73:9:73:16 | selector | xss-through-dom.js:77:4:77:11 | selector | provenance |  |
+| xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | xss-through-dom.js:73:9:73:16 | selector | provenance |  |
+| xss-through-dom.js:84:8:84:11 | text | xss-through-dom.js:86:33:86:36 | text | provenance |  |
+| xss-through-dom.js:84:8:84:11 | text | xss-through-dom.js:87:36:87:39 | text | provenance |  |
+| xss-through-dom.js:84:15:84:30 | $("text").text() | xss-through-dom.js:84:8:84:11 | text | provenance |  |
 | xss-through-dom.js:86:33:86:36 | text | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | provenance |  |
 | xss-through-dom.js:87:36:87:39 | text | xss-through-dom.js:87:16:87:40 | new ans ... s(text) | provenance |  |
 | xss-through-dom.js:109:45:109:55 | this.el.src | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | provenance |  |
-| xss-through-dom.js:114:11:114:52 | src | xss-through-dom.js:115:16:115:18 | src | provenance |  |
-| xss-through-dom.js:114:11:114:52 | src | xss-through-dom.js:117:26:117:28 | src | provenance |  |
-| xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:114:11:114:52 | src | provenance |  |
+| xss-through-dom.js:114:11:114:13 | src | xss-through-dom.js:115:16:115:18 | src | provenance |  |
+| xss-through-dom.js:114:11:114:13 | src | xss-through-dom.js:117:26:117:28 | src | provenance |  |
+| xss-through-dom.js:114:17:114:52 | documen ... k").src | xss-through-dom.js:114:11:114:13 | src | provenance |  |
 | xss-through-dom.js:120:23:120:37 | ev.target.files | xss-through-dom.js:120:23:120:45 | ev.targ ... 0].name | provenance |  |
 | xss-through-dom.js:122:53:122:67 | ev.target.files | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | provenance |  |
 | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | provenance | Config |
-| xss-through-dom.js:130:6:130:68 | linkText | xss-through-dom.js:131:19:131:26 | linkText | provenance |  |
-| xss-through-dom.js:130:6:130:68 | linkText | xss-through-dom.js:132:16:132:23 | linkText | provenance |  |
-| xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:130:6:130:68 | linkText | provenance |  |
-| xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:130:6:130:68 | linkText | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:140:19:140:21 | src | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:141:25:141:27 | src | provenance |  |
-| xss-through-dom.js:139:11:139:52 | src | xss-through-dom.js:150:24:150:26 | src | provenance |  |
-| xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:139:11:139:52 | src | provenance |  |
+| xss-through-dom.js:130:6:130:13 | linkText | xss-through-dom.js:131:19:131:26 | linkText | provenance |  |
+| xss-through-dom.js:130:6:130:13 | linkText | xss-through-dom.js:132:16:132:23 | linkText | provenance |  |
+| xss-through-dom.js:130:17:130:37 | wSelect ... tring() | xss-through-dom.js:130:6:130:13 | linkText | provenance |  |
+| xss-through-dom.js:130:42:130:62 | dSelect ... tring() | xss-through-dom.js:130:6:130:13 | linkText | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:140:19:140:21 | src | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:141:25:141:27 | src | provenance |  |
+| xss-through-dom.js:139:11:139:13 | src | xss-through-dom.js:150:24:150:26 | src | provenance |  |
+| xss-through-dom.js:139:17:139:52 | documen ... k").src | xss-through-dom.js:139:11:139:13 | src | provenance |  |
 | xss-through-dom.js:154:25:154:27 | msg | xss-through-dom.js:155:27:155:29 | msg | provenance |  |
 | xss-through-dom.js:159:34:159:52 | $("textarea").val() | xss-through-dom.js:154:25:154:27 | msg | provenance |  |
 nodes
@@ -111,7 +111,7 @@ nodes
 | forms.js:28:20:28:25 | values | semmle.label | values |
 | forms.js:29:23:29:28 | values | semmle.label | values |
 | forms.js:29:23:29:34 | values.email | semmle.label | values.email |
-| forms.js:34:11:34:53 | values | semmle.label | values |
+| forms.js:34:13:34:18 | values | semmle.label | values |
 | forms.js:34:13:34:18 | values | semmle.label | values |
 | forms.js:35:19:35:24 | values | semmle.label | values |
 | forms.js:35:19:35:30 | values.email | semmle.label | values.email |
@@ -122,7 +122,7 @@ nodes
 | forms.js:71:21:71:24 | data | semmle.label | data |
 | forms.js:72:19:72:22 | data | semmle.label | data |
 | forms.js:72:19:72:27 | data.name | semmle.label | data.name |
-| forms.js:92:17:92:36 | values | semmle.label | values |
+| forms.js:92:17:92:22 | values | semmle.label | values |
 | forms.js:92:26:92:36 | getValues() | semmle.label | getValues() |
 | forms.js:93:25:93:30 | values | semmle.label | values |
 | forms.js:93:25:93:35 | values.name | semmle.label | values.name |
@@ -142,12 +142,12 @@ nodes
 | xss-through-dom.js:61:30:61:69 | $(docum ... value") | semmle.label | $(docum ... value") |
 | xss-through-dom.js:64:30:64:40 | valMethod() | semmle.label | valMethod() |
 | xss-through-dom.js:71:11:71:32 | $("inpu ... 0).name | semmle.label | $("inpu ... 0).name |
-| xss-through-dom.js:73:9:73:41 | selector | semmle.label | selector |
+| xss-through-dom.js:73:9:73:16 | selector | semmle.label | selector |
 | xss-through-dom.js:73:20:73:41 | $("inpu ... 0).name | semmle.label | $("inpu ... 0).name |
 | xss-through-dom.js:77:4:77:11 | selector | semmle.label | selector |
 | xss-through-dom.js:79:4:79:34 | documen ... t.value | semmle.label | documen ... t.value |
 | xss-through-dom.js:81:17:81:43 | $('#foo ... rText') | semmle.label | $('#foo ... rText') |
-| xss-through-dom.js:84:8:84:30 | text | semmle.label | text |
+| xss-through-dom.js:84:8:84:11 | text | semmle.label | text |
 | xss-through-dom.js:84:15:84:30 | $("text").text() | semmle.label | $("text").text() |
 | xss-through-dom.js:86:16:86:37 | anser.a ... l(text) | semmle.label | anser.a ... l(text) |
 | xss-through-dom.js:86:33:86:36 | text | semmle.label | text |
@@ -157,7 +157,7 @@ nodes
 | xss-through-dom.js:96:17:96:47 | $("#foo ... ].value | semmle.label | $("#foo ... ].value |
 | xss-through-dom.js:109:31:109:70 | "<a src ... oo</a>" | semmle.label | "<a src ... oo</a>" |
 | xss-through-dom.js:109:45:109:55 | this.el.src | semmle.label | this.el.src |
-| xss-through-dom.js:114:11:114:52 | src | semmle.label | src |
+| xss-through-dom.js:114:11:114:13 | src | semmle.label | src |
 | xss-through-dom.js:114:17:114:52 | documen ... k").src | semmle.label | documen ... k").src |
 | xss-through-dom.js:115:16:115:18 | src | semmle.label | src |
 | xss-through-dom.js:117:26:117:28 | src | semmle.label | src |
@@ -166,12 +166,12 @@ nodes
 | xss-through-dom.js:122:33:122:71 | URL.cre ... les[0]) | semmle.label | URL.cre ... les[0]) |
 | xss-through-dom.js:122:53:122:67 | ev.target.files | semmle.label | ev.target.files |
 | xss-through-dom.js:122:53:122:70 | ev.target.files[0] | semmle.label | ev.target.files[0] |
-| xss-through-dom.js:130:6:130:68 | linkText | semmle.label | linkText |
+| xss-through-dom.js:130:6:130:13 | linkText | semmle.label | linkText |
 | xss-through-dom.js:130:17:130:37 | wSelect ... tring() | semmle.label | wSelect ... tring() |
 | xss-through-dom.js:130:42:130:62 | dSelect ... tring() | semmle.label | dSelect ... tring() |
 | xss-through-dom.js:131:19:131:26 | linkText | semmle.label | linkText |
 | xss-through-dom.js:132:16:132:23 | linkText | semmle.label | linkText |
-| xss-through-dom.js:139:11:139:52 | src | semmle.label | src |
+| xss-through-dom.js:139:11:139:13 | src | semmle.label | src |
 | xss-through-dom.js:139:17:139:52 | documen ... k").src | semmle.label | documen ... k").src |
 | xss-through-dom.js:140:19:140:21 | src | semmle.label | src |
 | xss-through-dom.js:141:25:141:27 | src | semmle.label | src |
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 b6710ee92f5a..48d4262921d7 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,11 +1,11 @@
 #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:4:5:4:8 | temp | test.js:7:58:7:61 | temp | provenance |  |
+| test.js:4:12:4:22 | process.env | test.js:4:5:4:8 | 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:5:4:8 | 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 |
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 b0ae2737b003..e4e45ed74d5c 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
@@ -3,26 +3,26 @@
 | 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:7:13:7 | v | typedClient.ts:14:30:14:30 | v | provenance |  |
+| typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | typedClient.ts:13:7:13:7 | 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:7:21:7 | v | typedClient.ts:22:33:22:33 | v | provenance |  |
+| typedClient.ts:21:7:21:7 | v | typedClient.ts:23:33:23:33 | v | provenance |  |
+| typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | typedClient.ts:21:7:21:7 | 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:7:13:7 | v | semmle.label | v |
 | typedClient.ts:13:11:13:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | typedClient.ts:13:22:13:29 | req.body | semmle.label | req.body |
 | typedClient.ts:13:22:13:31 | req.body.x | semmle.label | req.body.x |
 | typedClient.ts:14:24:14:32 | { id: v } | semmle.label | { id: v } |
 | typedClient.ts:14:30:14:30 | v | semmle.label | v |
-| typedClient.ts:21:7:21:32 | v | semmle.label | v |
+| typedClient.ts:21:7:21:7 | v | semmle.label | v |
 | typedClient.ts:21:11:21:32 | JSON.pa ... body.x) | semmle.label | JSON.pa ... body.x) |
 | typedClient.ts:21:22:21:29 | req.body | semmle.label | req.body |
 | typedClient.ts:21:22:21:31 | req.body.x | semmle.label | req.body.x |
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 843d41eb9229..9405e075e332 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
@@ -137,63 +137,63 @@
 | 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:8:11:8:12 | id | graphql.js:11:46:11:47 | id | provenance |  |
+| graphql.js:8:16:8:28 | req.params.id | graphql.js:8:11:8:12 | 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:25:11:25:12 | id | graphql.js:26:37:26:38 | id | provenance |  |
+| graphql.js:25:11:25:12 | id | graphql.js:29:39:29:40 | id | provenance |  |
+| graphql.js:25:11:25:12 | id | graphql.js:32:25:32:26 | id | provenance |  |
+| graphql.js:25:16:25:28 | req.params.id | graphql.js:25:11:25:12 | 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:38:11:38:12 | id | graphql.js:43:21:43:22 | id | provenance |  |
+| graphql.js:38:11:38:12 | id | graphql.js:47:51:47:52 | id | provenance |  |
+| graphql.js:38:16:38:28 | req.params.id | graphql.js:38:11:38:12 | 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:54:11:54:12 | id | graphql.js:55:46:55:47 | id | provenance |  |
+| graphql.js:54:11:54:12 | id | graphql.js:57:73:57:74 | id | provenance |  |
+| graphql.js:54:16:54:28 | req.params.id | graphql.js:54:11:54:12 | 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:73:9:73:10 | id | graphql.js:74:56:74:57 | id | provenance |  |
+| graphql.js:73:9:73:10 | id | graphql.js:86:13:86:14 | id | provenance |  |
+| graphql.js:73:14:73:25 | req.query.id | graphql.js:73:9:73:10 | 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:117:11:117:12 | id | graphql.js:118:45:118:46 | id | provenance |  |
+| graphql.js:117:16:117:28 | req.params.id | graphql.js:117:11:117:12 | 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:9:13:9:26 | maliciousInput | hana.js:10:64:10:77 | maliciousInput | provenance |  |
+| hana.js:9:30:9:37 | req.body | hana.js:9:13:9:26 | maliciousInput | provenance |  |
+| hana.js:10:15:10:19 | query | hana.js:11:19:11:23 | query | provenance |  |
+| hana.js:10:64:10:77 | maliciousInput | hana.js:10:15:10:19 | query | provenance |  |
+| hana.js:16:15:16:28 | maliciousInput | hana.js:17:87:17:100 | maliciousInput | provenance |  |
+| hana.js:16:32:16:39 | req.body | hana.js:16:15:16:28 | 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:23:15:23:28 | maliciousInput | hana.js:24:83:24:96 | maliciousInput | provenance |  |
+| hana.js:23:32:23:39 | req.body | hana.js:23:15:23:28 | 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:30:13:30:26 | maliciousInput | hana.js:31:84:31:97 | maliciousInput | provenance |  |
+| hana.js:30:30:30:37 | req.body | hana.js:30:13:30:26 | 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:47:7:47:20 | maliciousInput | hana.js:48:39:48:52 | maliciousInput | provenance |  |
+| hana.js:47:7:47:20 | maliciousInput | hana.js:50:76:50:89 | maliciousInput | provenance |  |
+| hana.js:47:7:47:20 | maliciousInput | hana.js:54:53:54:66 | maliciousInput | provenance |  |
+| hana.js:47:24:47:31 | req.body | hana.js:47:7:47:20 | 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:68:7:68:20 | maliciousInput | hana.js:71:86:71:99 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:73:41:73:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:74:41:74:54 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:76:60:76:73 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:80:56:80:69 | maliciousInput | provenance |  |
+| hana.js:68:7:68:20 | maliciousInput | hana.js:84:65:84:78 | maliciousInput | provenance |  |
+| hana.js:68:24:68:31 | req.body | hana.js:68:7:68:20 | 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 |  |
@@ -201,151 +201,151 @@ edges
 | 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:5:14:10 | 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:10 | 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:15:25:19 | query | json-schema-validator.js:33:22:33:26 | query | provenance |  |
+| json-schema-validator.js:25:15:25:19 | 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:19 | 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:15:50:19 | query | json-schema-validator.js:55:22:55:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:19 | query | json-schema-validator.js:59:22:59:26 | query | provenance |  |
+| json-schema-validator.js:50:15:50:19 | 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:19 | 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:5:13:5:19 | version | koarouter.js:5:13:5:19 | version | provenance |  |
+| koarouter.js:5:13:5:19 | version | koarouter.js:14:38:14:44 | 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:7:20:7 | q | ldap.js:22:18:22:18 | q | provenance |  |
+| ldap.js:20:11:20:34 | url.par ... , true) | ldap.js:20:7:20:7 | 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:22:7:22:14 | username | ldap.js:25:24:25:31 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:25:46:25:53 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:32:26:32:33 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:32:48:32:55 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:64:16:64:23 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:64:38:64:45 | username | provenance |  |
+| ldap.js:22:7:22:14 | username | ldap.js:68:33:68:40 | username | provenance |  |
+| ldap.js:22:18:22:18 | q | ldap.js:22:7:22:14 | 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:63:9:63:20 | parsedFilter | ldap.js:66:40:66:51 | parsedFilter | provenance |  |
+| ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | ldap.js:63:9:63:20 | 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:10:9:10:13 | 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:13 | 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:9:10:13 | 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:12:9:12:13 | query | marsdb.js:15:12:15:16 | query | provenance |  |
+| marsdb.js:12:17:12:18 | {} | marsdb.js:12:9:12:13 | 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:9:12:13 | 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:14:9:14:13 | query | minimongo.js:17:12:17:16 | query | provenance |  |
+| minimongo.js:14:17:14:18 | {} | minimongo.js:14:9:14:13 | 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:9:14:13 | 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:12:11:12:15 | query | mongodb.js:13:5:13:9 | query | provenance |  |
+| mongodb.js:12:19:12:20 | {} | mongodb.js:12:11:12:15 | 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:11:12:15 | 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:11:25:15 | 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:25:19:25:32 | req.body.title | mongodb.js:25:11:25:15 | 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:46:11:46:15 | query | mongodb.js:47:5:47:9 | query | provenance |  |
+| mongodb.js:46:19:46:20 | {} | mongodb.js:46:11:46:15 | 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:11:46:15 | 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:56:8:56:12 | query | mongodb.js:57:2:57:6 | query | provenance |  |
+| mongodb.js:56:16:56:17 | {} | mongodb.js:56:8:56:12 | 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:8:56:12 | 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:66:7:66:9 | tag | mongodb.js:72:22:72:24 | tag | provenance |  |
+| mongodb.js:66:7:66:9 | tag | mongodb.js:79:20:79:22 | tag | provenance |  |
+| mongodb.js:66:13:66:25 | req.query.tag | mongodb.js:66:7:66:9 | 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:100:9:100:13 | query | mongodb.js:101:3:101:7 | query | provenance |  |
+| mongodb.js:100:17:100:18 | {} | mongodb.js:100:9:100:13 | 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:9:100:13 | 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:23:11:23:15 | query | mongodb_bodySafe.js:24:5:24:9 | query | provenance |  |
+| mongodb_bodySafe.js:23:19:23:20 | {} | mongodb_bodySafe.js:23:11:23:15 | 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:11:23:15 | 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:20:8:20:12 | query | mongoose.js:21:2:21:6 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:23:22:23:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:25:17:25:21 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:27:22:27:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:29:21:29:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:31:28:31:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:33:16:33:20 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:35:19:35:23 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:37:28:37:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:39:28:39:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:41:28:41:32 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:43:22:43:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:45:18:45:22 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:47:22:47:26 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:49:21:49:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:51:32:51:36 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:53:27:53:31 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:54:8:54:12 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:57:17:57:21 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:58:10:58:14 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:59:8:59:12 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:60:7:60:11 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:61:16:61:20 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:62:12:62:16 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:63:10:63:14 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:67:37:67:41 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:68:46:68:50 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:69:47:69:51 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:90:21:90:25 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:97:14:97:18 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:99:31:99:35 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:119:38:119:42 | query | provenance |  |
+| mongoose.js:20:8:20:12 | query | mongoose.js:122:30:122:34 | query | provenance |  |
+| mongoose.js:20:16:20:17 | {} | mongoose.js:20:8:20:12 | 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:8:20:12 | 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 |
@@ -423,59 +423,59 @@ edges
 | 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:101:6:101:7 | id | mongoose.js:109:20:109:21 | id | provenance |  |
+| mongoose.js:101:6:101:7 | id | mongoose.js:116:23:116:24 | id | provenance |  |
+| mongoose.js:101:11:101:22 | req.query.id | mongoose.js:101:6:101:7 | id | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:102:22:102:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:103:21:103:24 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:104:21:104:24 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:105:18:105:21 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:106:22:106:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:107:16:107:19 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:108:19:108:22 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:110:28:110:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:111:28:111:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:112:28:112:31 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:113:18:113:21 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:114:22:114:25 | cond | provenance |  |
+| mongoose.js:101:25:101:28 | cond | mongoose.js:115:21:115:24 | cond | provenance |  |
+| mongoose.js:101:32:101:45 | req.query.cond | mongoose.js:101:25:101:28 | 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:19:11:19:15 | query | mongooseJsonParse.js:22:19:22:23 | query | provenance |  |
+| mongooseJsonParse.js:19:19:19:20 | {} | mongooseJsonParse.js:19:11:19:15 | 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:11:19:15 | 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:7:10:7 | v | mongooseModelClient.js:11:22:11:22 | v | provenance |  |
+| mongooseModelClient.js:10:11:10:32 | JSON.pa ... body.x) | mongooseModelClient.js:10:7:10:7 | 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:6:9:6:12 | temp | mysql.js:15:62:15:65 | temp | provenance |  |
+| mysql.js:6:9:6:12 | temp | mysql.js:19:70:19:73 | temp | provenance |  |
+| mysql.js:6:16:6:31 | req.params.value | mysql.js:6:9:6:12 | 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-types.ts:7:9:7:13 | 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:13 | taint | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:9:10:9:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:10:11:10:15 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:11:17:11:21 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:12:10:12:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:13:12:13:16 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:14:18:14:22 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:15:11:15:15 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:16:10:16:14 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:17:16:17:20 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:18:12:18:16 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | query | pg-promise.js:19:13:19:17 | query | provenance |  |
+| pg-promise.js:6:7:6:11 | 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:6:11 | 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 |  |
@@ -491,38 +491,38 @@ edges
 | 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:9:12:11 | key | redis.js:13:16:13:18 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:18:16:18:18 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:19:43:19:45 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:25:14:25:16 | key | provenance |  |
+| redis.js:12:9:12:11 | key | redis.js:26:14:26:16 | key | provenance |  |
+| redis.js:12:9:12:11 | 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:12:15:12:26 | req.body.key | redis.js:12:9:12:11 | 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:11:38:13 | key | redis.js:39:16:39:18 | key | provenance |  |
+| redis.js:38:11:38:13 | key | redis.js:43:27:43:29 | key | provenance |  |
+| redis.js:38:11:38:13 | 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 |  |
+| redis.js:38:17:38:28 | req.body.key | redis.js:38:11:38:13 | 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 |  |
+| tst3.js:7:7:7:12 | query1 | tst3.js:9:14:9:19 | query1 | provenance |  |
+| tst3.js:8:16:8:34 | req.params.category | tst3.js:7:7:7:12 | 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:11:8:12 | id | semmle.label | id |
 | graphql.js:8:16:8:28 | req.params.id | semmle.label | req.params.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:11:25:12 | 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 |
@@ -530,46 +530,46 @@ nodes
 | 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:11:38:12 | 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:11:54:12 | 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:9:73:10 | 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:11:117:12 | 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:13:9:26 | 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:15:10:19 | 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:15:16:28 | 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:15:23:28 | 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:13:30:26 | 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:7:47:20 | 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 |
@@ -577,7 +577,7 @@ nodes
 | 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:7:68:20 | 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 |
@@ -592,23 +592,23 @@ nodes
 | 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:5:14:10 | param1 | semmle.label | param1 |
 | html-sanitizer.js:14:14:14:24 | xss(param1) | semmle.label | xss(param1) |
 | html-sanitizer.js:14:18:14:23 | param1 | semmle.label | param1 |
 | html-sanitizer.js:16:9:16:59 | `SELECT ...  param1 | semmle.label | `SELECT ...  param1 |
 | html-sanitizer.js:16:54:16:59 | param1 | semmle.label | param1 |
-| json-schema-validator.js:25:15:25:48 | query | semmle.label | query |
+| json-schema-validator.js:25:15:25:19 | query | semmle.label | query |
 | json-schema-validator.js:25:23:25:48 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | json-schema-validator.js:25:34:25:47 | req.query.data | semmle.label | req.query.data |
 | json-schema-validator.js:33:22:33:26 | query | semmle.label | query |
 | json-schema-validator.js:35:18:35:22 | query | semmle.label | query |
-| json-schema-validator.js:50:15:50:48 | query | semmle.label | query |
+| json-schema-validator.js:50:15:50:19 | query | semmle.label | query |
 | json-schema-validator.js:50:23:50:48 | JSON.pa ... y.data) | semmle.label | JSON.pa ... y.data) |
 | json-schema-validator.js:50:34:50:47 | req.query.data | semmle.label | req.query.data |
 | json-schema-validator.js:55:22:55:26 | query | semmle.label | query |
 | json-schema-validator.js:59:22:59:26 | query | semmle.label | query |
 | json-schema-validator.js:61:22:61:26 | query | semmle.label | query |
-| koarouter.js:5:11:5:33 | version | semmle.label | version |
+| koarouter.js:5:13:5:19 | version | semmle.label | version |
 | koarouter.js:5:13:5:19 | version | semmle.label | version |
 | koarouter.js:14:9:14:18 | [post update] conditions [ArrayElement] | semmle.label | [post update] conditions [ArrayElement] |
 | koarouter.js:14:25:14:46 | `versio ... rsion}` | semmle.label | `versio ... rsion}` |
@@ -616,10 +616,10 @@ nodes
 | koarouter.js:17:27:17:77 | `SELECT ... nd ')}` | semmle.label | `SELECT ... nd ')}` |
 | koarouter.js:17:52:17:61 | conditions [ArrayElement] | semmle.label | conditions [ArrayElement] |
 | koarouter.js:17:52:17:75 | conditi ...  and ') | semmle.label | conditi ...  and ') |
-| ldap.js:20:7:20:34 | q | semmle.label | q |
+| ldap.js:20:7:20:7 | q | semmle.label | q |
 | ldap.js:20:11:20:34 | url.par ... , true) | semmle.label | url.par ... , true) |
 | ldap.js:20:21:20:27 | req.url | semmle.label | req.url |
-| ldap.js:22:7:22:33 | username | semmle.label | username |
+| ldap.js:22:7:22:14 | username | semmle.label | username |
 | ldap.js:22:18:22:18 | q | semmle.label | q |
 | ldap.js:25:13:25:57 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:25:24:25:31 | username | semmle.label | username |
@@ -629,7 +629,7 @@ nodes
 | ldap.js:32:15:32:59 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:32:26:32:33 | username | semmle.label | username |
 | ldap.js:32:48:32:55 | username | semmle.label | username |
-| ldap.js:63:9:65:3 | parsedFilter | semmle.label | parsedFilter |
+| ldap.js:63:9:63:20 | parsedFilter | semmle.label | parsedFilter |
 | ldap.js:63:24:65:3 | ldap.pa ... ))`\\n  ) | semmle.label | ldap.pa ... ))`\\n  ) |
 | ldap.js:64:5:64:49 | `(\|(nam ... ame}))` | semmle.label | `(\|(nam ... ame}))` |
 | ldap.js:64:16:64:23 | username | semmle.label | username |
@@ -638,60 +638,60 @@ nodes
 | ldap.js:66:40:66:51 | parsedFilter | semmle.label | parsedFilter |
 | ldap.js:68:27:68:42 | `cn=${username}` | semmle.label | `cn=${username}` |
 | ldap.js:68:33:68:40 | username | semmle.label | username |
-| marsdb-flow-to.js:10:9:10:18 | query | semmle.label | query |
+| marsdb-flow-to.js:10:9:10:13 | query | semmle.label | query |
 | 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:13:17:13:21 | query | semmle.label | query |
-| marsdb.js:12:9:12:18 | query | semmle.label | query |
+| marsdb.js:12:9:12:13 | 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:15:12:15:16 | query | semmle.label | query |
-| minimongo.js:14:9:14:18 | query | semmle.label | query |
+| minimongo.js:14:9:14:13 | 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:17:12:17:16 | query | semmle.label | query |
-| mongodb.js:12:11:12:20 | query | semmle.label | query |
+| mongodb.js:12:11:12:15 | 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:17:16:17:20 | query | semmle.label | query |
-| mongodb.js:25:11:25:32 | title | semmle.label | title |
+| mongodb.js:25:11:25:15 | 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:11:46:15 | 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:8:56:12 | 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:7:66:9 | 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:9:100:13 | 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:11:23:15 | 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:28:16:28:20 | query | semmle.label | query |
-| mongoose.js:20:8:20:17 | query | semmle.label | query |
+| mongoose.js:20:8:20:12 | 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 |
@@ -733,9 +733,9 @@ nodes
 | 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:6:101:7 | 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:25:101:28 | 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 |
@@ -755,13 +755,13 @@ nodes
 | 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:11:19:15 | 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:22:19:22:23 | query | semmle.label | query |
-| mongooseModelClient.js:10:7:10:32 | v | semmle.label | v |
+| mongooseModelClient.js:10:7:10:7 | 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 |
 | mongooseModelClient.js:10:22:10:31 | req.body.x | semmle.label | req.body.x |
@@ -770,16 +770,16 @@ nodes
 | mongooseModelClient.js:12:16:12:34 | { id: req.body.id } | semmle.label | { id: req.body.id } |
 | mongooseModelClient.js:12:22:12:29 | req.body | semmle.label | req.body |
 | mongooseModelClient.js:12:22:12:32 | req.body.id | semmle.label | req.body.id |
-| mysql.js:6:9:6:31 | temp | semmle.label | temp |
+| mysql.js:6:9:6:12 | temp | semmle.label | temp |
 | mysql.js:6:16:6:31 | req.params.value | semmle.label | req.params.value |
 | mysql.js:15:18:15:65 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | mysql.js:15:62:15:65 | temp | semmle.label | temp |
 | mysql.js:19:26:19:73 | 'SELECT ...  + temp | semmle.label | 'SELECT ...  + temp |
 | mysql.js:19:70:19:73 | temp | semmle.label | temp |
-| pg-promise-types.ts:7:9:7:28 | taint | semmle.label | taint |
+| pg-promise-types.ts:7:9:7:13 | taint | semmle.label | taint |
 | pg-promise-types.ts:7:17:7:28 | req.params.x | semmle.label | req.params.x |
 | pg-promise-types.ts:8:17:8:21 | taint | semmle.label | taint |
-| pg-promise.js:6:7:7:55 | query | semmle.label | query |
+| pg-promise.js:6:7:6:11 | query | semmle.label | query |
 | pg-promise.js:7:16:7:34 | req.params.category | semmle.label | req.params.category |
 | pg-promise.js:9:10:9:14 | query | semmle.label | query |
 | pg-promise.js:10:11:10:15 | query | semmle.label | query |
@@ -805,7 +805,7 @@ nodes
 | pg-promise.js:64:16:64:20 | query | semmle.label | query |
 | redis.js:10:16:10:23 | req.body | semmle.label | req.body |
 | redis.js:10:16:10:27 | req.body.key | semmle.label | req.body.key |
-| redis.js:12:9:12:26 | key | semmle.label | key |
+| redis.js:12:9:12:11 | key | semmle.label | key |
 | redis.js:12:15:12:22 | req.body | semmle.label | req.body |
 | redis.js:12:15:12:26 | req.body.key | semmle.label | req.body.key |
 | redis.js:13:16:13:18 | key | semmle.label | key |
@@ -815,7 +815,7 @@ nodes
 | redis.js:26:14:26:16 | key | semmle.label | key |
 | redis.js:30:23:30:25 | key | semmle.label | key |
 | redis.js:32:28:32:30 | key | semmle.label | key |
-| redis.js:38:11:38:28 | key | semmle.label | key |
+| redis.js:38:11:38:13 | key | semmle.label | key |
 | redis.js:38:17:38:24 | req.body | semmle.label | req.body |
 | redis.js:38:17:38:28 | req.body.key | semmle.label | req.body.key |
 | redis.js:39:16:39:18 | key | semmle.label | key |
@@ -826,7 +826,7 @@ nodes
 | socketio.js:11:46:11:51 | handle | semmle.label | handle |
 | 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:7:7:7:12 | 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 |
 | tst4.js:8:10:8:66 | 'SELECT ... d + '"' | semmle.label | 'SELECT ... d + '"' |
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 412f0a5c5fa5..8ddaba30fc8c 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
@@ -105,45 +105,45 @@ edges
 | 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:19:9:19:13 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:13 | taint | provenance |  |
+| express.js:27:9:27:13 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:13 | taint | provenance |  |
 | express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
-| fastify.js:4:9:4:43 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
-| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:9:9:9:40 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
-| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:15:9:15:44 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
-| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:21:9:21:47 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
-| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:26:9:26:44 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
-| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:31:9:31:50 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
-| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:37:9:37:44 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
-| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:42:9:42:41 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
-| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:47:9:47:43 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
-| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:52:11:52:50 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
-| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
-| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:39 | userInput | provenance |  |
-| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:39 | userInput | provenance |  |
+| fastify.js:4:9:4:17 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
+| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:9:9:9:17 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
+| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:15:9:15:17 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
+| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:21:9:21:17 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
+| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:26:9:26:17 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
+| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:31:9:31:17 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
+| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:37:9:37:17 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
+| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:42:9:42:17 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
+| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:47:9:47:17 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
+| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:52:11:52:19 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
+| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
+| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:17 | userInput | provenance |  |
+| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:17 | userInput | provenance |  |
 | fastify.js:66:24:66:36 | request.query | fastify.js:66:24:66:47 | request ... redCode | provenance |  |
 | fastify.js:66:24:66:47 | request ... redCode | fastify.js:71:34:71:51 | request.storedCode | provenance |  |
 | fastify.js:79:20:79:32 | request.query | fastify.js:79:20:79:42 | request ... plyCode | provenance |  |
@@ -151,44 +151,44 @@ edges
 | fastify.js:94:29:94:41 | request.query | fastify.js:94:29:94:51 | request ... plyCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:99:30:99:52 | reply.l ... tedCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:108:28:108:50 | reply.l ... tedCode | provenance |  |
-| fastify.js:106:9:106:38 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
-| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:38 | userInput | provenance |  |
-| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:38 | userInput | 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 |  |
+| fastify.js:106:9:106:17 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
+| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:17 | userInput | provenance |  |
+| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:17 | userInput | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | 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:13 | tainted | provenance |  |
 | react-server-function.js:3:35:3:35 | x | react-server-function.js:4:12:4:12 | x | provenance |  |
 | react-server-function.js:4:12:4:12 | x | react-server-function.js:4:12:4:29 | x + " from server" | provenance |  |
 | react-server-function.js:4:12:4:29 | x + " from server" | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | provenance |  |
-| react.js:24:9:24:45 | data | react.js:25:8:25:11 | data | provenance |  |
-| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:45 | data | provenance |  |
+| react.js:24:9:24:12 | data | react.js:25:8:25:11 | data | provenance |  |
+| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:12 | data | provenance |  |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | react.js:24:16:24:45 | use(ech ... alue")) | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
-| 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 |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | 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:15 | tainted | 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:9:22:14 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:14 | 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 |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:14 | 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 |
@@ -221,55 +221,55 @@ nodes
 | 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:9:19:13 | 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:9:27:13 | 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 |
-| fastify.js:4:9:4:43 | userInput | semmle.label | userInput |
+| fastify.js:4:9:4:17 | userInput | semmle.label | userInput |
 | fastify.js:4:21:4:33 | request.query | semmle.label | request.query |
 | fastify.js:4:21:4:43 | request ... Request | semmle.label | request ... Request |
 | fastify.js:5:44:5:52 | userInput | semmle.label | userInput |
-| fastify.js:9:9:9:40 | userInput | semmle.label | userInput |
+| fastify.js:9:9:9:17 | userInput | semmle.label | userInput |
 | fastify.js:9:21:9:33 | request.query | semmle.label | request.query |
 | fastify.js:9:21:9:40 | request.query.onSend | semmle.label | request.query.onSend |
 | fastify.js:10:44:10:52 | userInput | semmle.label | userInput |
-| fastify.js:15:9:15:44 | userInput | semmle.label | userInput |
+| fastify.js:15:9:15:17 | userInput | semmle.label | userInput |
 | fastify.js:15:21:15:33 | request.query | semmle.label | request.query |
 | fastify.js:15:21:15:44 | request ... Parsing | semmle.label | request ... Parsing |
 | fastify.js:16:44:16:52 | userInput | semmle.label | userInput |
-| fastify.js:21:9:21:47 | userInput | semmle.label | userInput |
+| fastify.js:21:9:21:17 | userInput | semmle.label | userInput |
 | fastify.js:21:21:21:33 | request.query | semmle.label | request.query |
 | fastify.js:21:21:21:47 | request ... idation | semmle.label | request ... idation |
 | fastify.js:22:44:22:52 | userInput | semmle.label | userInput |
-| fastify.js:26:9:26:44 | userInput | semmle.label | userInput |
+| fastify.js:26:9:26:17 | userInput | semmle.label | userInput |
 | fastify.js:26:21:26:33 | request.query | semmle.label | request.query |
 | fastify.js:26:21:26:44 | request ... Handler | semmle.label | request ... Handler |
 | fastify.js:27:44:27:52 | userInput | semmle.label | userInput |
-| fastify.js:31:9:31:50 | userInput | semmle.label | userInput |
+| fastify.js:31:9:31:17 | userInput | semmle.label | userInput |
 | fastify.js:31:21:31:33 | request.query | semmle.label | request.query |
 | fastify.js:31:21:31:50 | request ... ization | semmle.label | request ... ization |
 | fastify.js:32:44:32:52 | userInput | semmle.label | userInput |
-| fastify.js:37:9:37:44 | userInput | semmle.label | userInput |
+| fastify.js:37:9:37:17 | userInput | semmle.label | userInput |
 | fastify.js:37:21:37:33 | request.query | semmle.label | request.query |
 | fastify.js:37:21:37:44 | request ... esponse | semmle.label | request ... esponse |
 | fastify.js:38:44:38:52 | userInput | semmle.label | userInput |
-| fastify.js:42:9:42:41 | userInput | semmle.label | userInput |
+| fastify.js:42:9:42:17 | userInput | semmle.label | userInput |
 | fastify.js:42:21:42:33 | request.query | semmle.label | request.query |
 | fastify.js:42:21:42:41 | request ... onError | semmle.label | request ... onError |
 | fastify.js:43:44:43:52 | userInput | semmle.label | userInput |
-| fastify.js:47:9:47:43 | userInput | semmle.label | userInput |
+| fastify.js:47:9:47:17 | userInput | semmle.label | userInput |
 | fastify.js:47:21:47:33 | request.query | semmle.label | request.query |
 | fastify.js:47:21:47:43 | request ... Timeout | semmle.label | request ... Timeout |
 | fastify.js:48:44:48:52 | userInput | semmle.label | userInput |
-| fastify.js:52:11:52:50 | userInput | semmle.label | userInput |
+| fastify.js:52:11:52:19 | userInput | semmle.label | userInput |
 | fastify.js:52:23:52:35 | request.query | semmle.label | request.query |
 | fastify.js:52:23:52:50 | request ... stAbort | semmle.label | request ... stAbort |
 | fastify.js:53:46:53:54 | userInput | semmle.label | userInput |
-| fastify.js:57:9:57:39 | userInput | semmle.label | userInput |
+| fastify.js:57:9:57:17 | userInput | semmle.label | userInput |
 | fastify.js:57:21:57:33 | request.query | semmle.label | request.query |
 | fastify.js:57:21:57:39 | request.query.input | semmle.label | request.query.input |
 | fastify.js:58:44:58:52 | userInput | semmle.label | userInput |
@@ -283,14 +283,14 @@ nodes
 | fastify.js:94:29:94:41 | request.query | semmle.label | request.query |
 | fastify.js:94:29:94:51 | request ... plyCode | semmle.label | request ... plyCode |
 | fastify.js:99:30:99:52 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
-| fastify.js:106:9:106:38 | userInput | semmle.label | userInput |
+| fastify.js:106:9:106:17 | userInput | semmle.label | userInput |
 | fastify.js:106:21:106:33 | request.query | semmle.label | request.query |
 | fastify.js:106:21:106:38 | request.query.code | semmle.label | request.query.code |
 | fastify.js:107:23:107:31 | userInput | semmle.label | userInput |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
 | 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 |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:32:8:38 | tainted | semmle.label | tainted |
 | react-native.js:10:23:10:29 | tainted | semmle.label | tainted |
@@ -298,11 +298,11 @@ nodes
 | react-server-function.js:4:12:4:12 | x | semmle.label | x |
 | react-server-function.js:4:12:4:29 | x + " from server" | semmle.label | x + " from server" |
 | react.js:11:56:11:77 | documen ... on.hash | semmle.label | documen ... on.hash |
-| react.js:24:9:24:45 | data | semmle.label | data |
+| react.js:24:9:24:12 | data | semmle.label | data |
 | react.js:24:16:24:45 | use(ech ... alue")) | semmle.label | use(ech ... alue")) |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | semmle.label | echoSer ... value") [PromiseValue] |
 | react.js:25:8:25:11 | data | semmle.label | data |
-| template-sinks.js:18:9:18:31 | tainted | semmle.label | tainted |
+| template-sinks.js:18:9:18:15 | tainted | semmle.label | tainted |
 | template-sinks.js:18:19:18:31 | req.query.foo | semmle.label | req.query.foo |
 | template-sinks.js:20:17:20:23 | tainted | semmle.label | tainted |
 | template-sinks.js:21:16:21:22 | tainted | semmle.label | tainted |
@@ -330,7 +330,7 @@ nodes
 | 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:9:22:14 | 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 |
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 5a249b086b97..db39855c5e5c 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
@@ -6,45 +6,45 @@ edges
 | 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:19:9:19:13 | taint | express.js:20:34:20:38 | taint | provenance |  |
+| express.js:19:17:19:35 | req.param("wobble") | express.js:19:9:19:13 | taint | provenance |  |
+| express.js:27:9:27:13 | taint | express.js:36:15:36:19 | taint | provenance |  |
+| express.js:27:17:27:35 | req.param("wobble") | express.js:27:9:27:13 | taint | provenance |  |
 | express.js:42:30:42:32 | msg | express.js:43:10:43:12 | msg | provenance |  |
-| fastify.js:4:9:4:43 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
-| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:43 | userInput | provenance |  |
-| fastify.js:9:9:9:40 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
-| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:40 | userInput | provenance |  |
-| fastify.js:15:9:15:44 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
-| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:44 | userInput | provenance |  |
-| fastify.js:21:9:21:47 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
-| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:47 | userInput | provenance |  |
-| fastify.js:26:9:26:44 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
-| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:44 | userInput | provenance |  |
-| fastify.js:31:9:31:50 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
-| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:50 | userInput | provenance |  |
-| fastify.js:37:9:37:44 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
-| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:44 | userInput | provenance |  |
-| fastify.js:42:9:42:41 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
-| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:41 | userInput | provenance |  |
-| fastify.js:47:9:47:43 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
-| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:43 | userInput | provenance |  |
-| fastify.js:52:11:52:50 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
-| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:50 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
-| fastify.js:57:9:57:39 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
-| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:39 | userInput | provenance |  |
-| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:39 | userInput | provenance |  |
+| fastify.js:4:9:4:17 | userInput | fastify.js:5:44:5:52 | userInput | provenance |  |
+| fastify.js:4:21:4:33 | request.query | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:4:21:4:43 | request ... Request | fastify.js:4:9:4:17 | userInput | provenance |  |
+| fastify.js:9:9:9:17 | userInput | fastify.js:10:44:10:52 | userInput | provenance |  |
+| fastify.js:9:21:9:33 | request.query | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:9:21:9:40 | request.query.onSend | fastify.js:9:9:9:17 | userInput | provenance |  |
+| fastify.js:15:9:15:17 | userInput | fastify.js:16:44:16:52 | userInput | provenance |  |
+| fastify.js:15:21:15:33 | request.query | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:15:21:15:44 | request ... Parsing | fastify.js:15:9:15:17 | userInput | provenance |  |
+| fastify.js:21:9:21:17 | userInput | fastify.js:22:44:22:52 | userInput | provenance |  |
+| fastify.js:21:21:21:33 | request.query | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:21:21:21:47 | request ... idation | fastify.js:21:9:21:17 | userInput | provenance |  |
+| fastify.js:26:9:26:17 | userInput | fastify.js:27:44:27:52 | userInput | provenance |  |
+| fastify.js:26:21:26:33 | request.query | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:26:21:26:44 | request ... Handler | fastify.js:26:9:26:17 | userInput | provenance |  |
+| fastify.js:31:9:31:17 | userInput | fastify.js:32:44:32:52 | userInput | provenance |  |
+| fastify.js:31:21:31:33 | request.query | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:31:21:31:50 | request ... ization | fastify.js:31:9:31:17 | userInput | provenance |  |
+| fastify.js:37:9:37:17 | userInput | fastify.js:38:44:38:52 | userInput | provenance |  |
+| fastify.js:37:21:37:33 | request.query | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:37:21:37:44 | request ... esponse | fastify.js:37:9:37:17 | userInput | provenance |  |
+| fastify.js:42:9:42:17 | userInput | fastify.js:43:44:43:52 | userInput | provenance |  |
+| fastify.js:42:21:42:33 | request.query | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:42:21:42:41 | request ... onError | fastify.js:42:9:42:17 | userInput | provenance |  |
+| fastify.js:47:9:47:17 | userInput | fastify.js:48:44:48:52 | userInput | provenance |  |
+| fastify.js:47:21:47:33 | request.query | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:47:21:47:43 | request ... Timeout | fastify.js:47:9:47:17 | userInput | provenance |  |
+| fastify.js:52:11:52:19 | userInput | fastify.js:53:46:53:54 | userInput | provenance |  |
+| fastify.js:52:23:52:35 | request.query | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:52:23:52:50 | request ... stAbort | fastify.js:52:11:52:19 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:58:44:58:52 | userInput | provenance |  |
+| fastify.js:57:9:57:17 | userInput | fastify.js:59:23:59:31 | userInput | provenance |  |
+| fastify.js:57:21:57:33 | request.query | fastify.js:57:9:57:17 | userInput | provenance |  |
+| fastify.js:57:21:57:39 | request.query.input | fastify.js:57:9:57:17 | userInput | provenance |  |
 | fastify.js:66:24:66:36 | request.query | fastify.js:66:24:66:47 | request ... redCode | provenance |  |
 | fastify.js:66:24:66:47 | request ... redCode | fastify.js:71:34:71:51 | request.storedCode | provenance |  |
 | fastify.js:79:20:79:32 | request.query | fastify.js:79:20:79:42 | request ... plyCode | provenance |  |
@@ -52,44 +52,44 @@ edges
 | fastify.js:94:29:94:41 | request.query | fastify.js:94:29:94:51 | request ... plyCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:99:30:99:52 | reply.l ... tedCode | provenance |  |
 | fastify.js:94:29:94:51 | request ... plyCode | fastify.js:108:28:108:50 | reply.l ... tedCode | provenance |  |
-| fastify.js:106:9:106:38 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
-| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:38 | userInput | provenance |  |
-| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:38 | userInput | 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 |  |
+| fastify.js:106:9:106:17 | userInput | fastify.js:107:23:107:31 | userInput | provenance |  |
+| fastify.js:106:21:106:33 | request.query | fastify.js:106:9:106:17 | userInput | provenance |  |
+| fastify.js:106:21:106:38 | request.query.code | fastify.js:106:9:106:17 | userInput | provenance |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:32:8:38 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | 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:13 | tainted | provenance |  |
 | react-server-function.js:3:35:3:35 | x | react-server-function.js:4:12:4:12 | x | provenance |  |
 | react-server-function.js:4:12:4:12 | x | react-server-function.js:4:12:4:29 | x + " from server" | provenance |  |
 | react-server-function.js:4:12:4:29 | x + " from server" | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | provenance |  |
-| react.js:24:9:24:45 | data | react.js:25:8:25:11 | data | provenance |  |
-| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:45 | data | provenance |  |
+| react.js:24:9:24:12 | data | react.js:25:8:25:11 | data | provenance |  |
+| react.js:24:16:24:45 | use(ech ... alue")) | react.js:24:9:24:12 | data | provenance |  |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | react.js:24:16:24:45 | use(ech ... alue")) | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
-| template-sinks.js:18:9:18:31 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
-| 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 |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:20:17:20:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:21:16:21:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:22:18:22:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:23:17:23:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:24:18:24:24 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:25:16:25:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:26:27:26:33 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:27:21:27:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:28:17:28:23 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:29:24:29:30 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:30:21:30:27 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:31:19:31:25 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | tainted | template-sinks.js:32:16:32:22 | tainted | provenance |  |
+| template-sinks.js:18:9:18:15 | 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:15 | tainted | 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:9:22:14 | source | tst.js:24:18:24:23 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:26:14:26:19 | source | provenance |  |
+| tst.js:22:9:22:14 | source | tst.js:28:28:28:33 | source | provenance |  |
+| tst.js:22:9:22:14 | 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 |  |
+| tst.js:22:18:22:82 | documen ... , "$1") | tst.js:22:9:22:14 | 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 |
@@ -124,55 +124,55 @@ nodes
 | 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:9:19:13 | 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:9:27:13 | 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 |
-| fastify.js:4:9:4:43 | userInput | semmle.label | userInput |
+| fastify.js:4:9:4:17 | userInput | semmle.label | userInput |
 | fastify.js:4:21:4:33 | request.query | semmle.label | request.query |
 | fastify.js:4:21:4:43 | request ... Request | semmle.label | request ... Request |
 | fastify.js:5:44:5:52 | userInput | semmle.label | userInput |
-| fastify.js:9:9:9:40 | userInput | semmle.label | userInput |
+| fastify.js:9:9:9:17 | userInput | semmle.label | userInput |
 | fastify.js:9:21:9:33 | request.query | semmle.label | request.query |
 | fastify.js:9:21:9:40 | request.query.onSend | semmle.label | request.query.onSend |
 | fastify.js:10:44:10:52 | userInput | semmle.label | userInput |
-| fastify.js:15:9:15:44 | userInput | semmle.label | userInput |
+| fastify.js:15:9:15:17 | userInput | semmle.label | userInput |
 | fastify.js:15:21:15:33 | request.query | semmle.label | request.query |
 | fastify.js:15:21:15:44 | request ... Parsing | semmle.label | request ... Parsing |
 | fastify.js:16:44:16:52 | userInput | semmle.label | userInput |
-| fastify.js:21:9:21:47 | userInput | semmle.label | userInput |
+| fastify.js:21:9:21:17 | userInput | semmle.label | userInput |
 | fastify.js:21:21:21:33 | request.query | semmle.label | request.query |
 | fastify.js:21:21:21:47 | request ... idation | semmle.label | request ... idation |
 | fastify.js:22:44:22:52 | userInput | semmle.label | userInput |
-| fastify.js:26:9:26:44 | userInput | semmle.label | userInput |
+| fastify.js:26:9:26:17 | userInput | semmle.label | userInput |
 | fastify.js:26:21:26:33 | request.query | semmle.label | request.query |
 | fastify.js:26:21:26:44 | request ... Handler | semmle.label | request ... Handler |
 | fastify.js:27:44:27:52 | userInput | semmle.label | userInput |
-| fastify.js:31:9:31:50 | userInput | semmle.label | userInput |
+| fastify.js:31:9:31:17 | userInput | semmle.label | userInput |
 | fastify.js:31:21:31:33 | request.query | semmle.label | request.query |
 | fastify.js:31:21:31:50 | request ... ization | semmle.label | request ... ization |
 | fastify.js:32:44:32:52 | userInput | semmle.label | userInput |
-| fastify.js:37:9:37:44 | userInput | semmle.label | userInput |
+| fastify.js:37:9:37:17 | userInput | semmle.label | userInput |
 | fastify.js:37:21:37:33 | request.query | semmle.label | request.query |
 | fastify.js:37:21:37:44 | request ... esponse | semmle.label | request ... esponse |
 | fastify.js:38:44:38:52 | userInput | semmle.label | userInput |
-| fastify.js:42:9:42:41 | userInput | semmle.label | userInput |
+| fastify.js:42:9:42:17 | userInput | semmle.label | userInput |
 | fastify.js:42:21:42:33 | request.query | semmle.label | request.query |
 | fastify.js:42:21:42:41 | request ... onError | semmle.label | request ... onError |
 | fastify.js:43:44:43:52 | userInput | semmle.label | userInput |
-| fastify.js:47:9:47:43 | userInput | semmle.label | userInput |
+| fastify.js:47:9:47:17 | userInput | semmle.label | userInput |
 | fastify.js:47:21:47:33 | request.query | semmle.label | request.query |
 | fastify.js:47:21:47:43 | request ... Timeout | semmle.label | request ... Timeout |
 | fastify.js:48:44:48:52 | userInput | semmle.label | userInput |
-| fastify.js:52:11:52:50 | userInput | semmle.label | userInput |
+| fastify.js:52:11:52:19 | userInput | semmle.label | userInput |
 | fastify.js:52:23:52:35 | request.query | semmle.label | request.query |
 | fastify.js:52:23:52:50 | request ... stAbort | semmle.label | request ... stAbort |
 | fastify.js:53:46:53:54 | userInput | semmle.label | userInput |
-| fastify.js:57:9:57:39 | userInput | semmle.label | userInput |
+| fastify.js:57:9:57:17 | userInput | semmle.label | userInput |
 | fastify.js:57:21:57:33 | request.query | semmle.label | request.query |
 | fastify.js:57:21:57:39 | request.query.input | semmle.label | request.query.input |
 | fastify.js:58:44:58:52 | userInput | semmle.label | userInput |
@@ -186,14 +186,14 @@ nodes
 | fastify.js:94:29:94:41 | request.query | semmle.label | request.query |
 | fastify.js:94:29:94:51 | request ... plyCode | semmle.label | request ... plyCode |
 | fastify.js:99:30:99:52 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
-| fastify.js:106:9:106:38 | userInput | semmle.label | userInput |
+| fastify.js:106:9:106:17 | userInput | semmle.label | userInput |
 | fastify.js:106:21:106:33 | request.query | semmle.label | request.query |
 | fastify.js:106:21:106:38 | request.query.code | semmle.label | request.query.code |
 | fastify.js:107:23:107:31 | userInput | semmle.label | userInput |
 | fastify.js:108:28:108:50 | reply.l ... tedCode | semmle.label | reply.l ... tedCode |
 | 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 |
+| react-native.js:7:7:7:13 | tainted | semmle.label | tainted |
 | react-native.js:7:17:7:33 | req.param("code") | semmle.label | req.param("code") |
 | react-native.js:8:32:8:38 | tainted | semmle.label | tainted |
 | react-native.js:10:23:10:29 | tainted | semmle.label | tainted |
@@ -201,11 +201,11 @@ nodes
 | react-server-function.js:4:12:4:12 | x | semmle.label | x |
 | react-server-function.js:4:12:4:29 | x + " from server" | semmle.label | x + " from server" |
 | react.js:11:56:11:77 | documen ... on.hash | semmle.label | documen ... on.hash |
-| react.js:24:9:24:45 | data | semmle.label | data |
+| react.js:24:9:24:12 | data | semmle.label | data |
 | react.js:24:16:24:45 | use(ech ... alue")) | semmle.label | use(ech ... alue")) |
 | react.js:24:20:24:44 | echoSer ... value") [PromiseValue] | semmle.label | echoSer ... value") [PromiseValue] |
 | react.js:25:8:25:11 | data | semmle.label | data |
-| template-sinks.js:18:9:18:31 | tainted | semmle.label | tainted |
+| template-sinks.js:18:9:18:15 | tainted | semmle.label | tainted |
 | template-sinks.js:18:19:18:31 | req.query.foo | semmle.label | req.query.foo |
 | template-sinks.js:20:17:20:23 | tainted | semmle.label | tainted |
 | template-sinks.js:21:16:21:22 | tainted | semmle.label | tainted |
@@ -233,7 +233,7 @@ nodes
 | 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:9:22:14 | 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 |
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 84c50efddc96..ff58ba1fedcc 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
@@ -14,8 +14,8 @@ edges
 | bad-code-sanitization.js:7:21:7:70 | `${name ... key])}` | bad-code-sanitization.js:7:5:7:14 | [post update] statements [ArrayElement] | provenance |  |
 | bad-code-sanitization.js:7:31:7:43 | safeProp(key) | bad-code-sanitization.js:7:21:7:70 | `${name ... key])}` | provenance |  |
 | bad-code-sanitization.js:8:27:8:36 | statements [ArrayElement] | bad-code-sanitization.js:8:27:8:46 | statements.join(';') | provenance |  |
-| bad-code-sanitization.js:63:11:63:55 | assignment | bad-code-sanitization.js:64:27:64:36 | assignment | provenance |  |
-| bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:63:11:63:55 | assignment | provenance |  |
+| bad-code-sanitization.js:63:11:63:20 | assignment | bad-code-sanitization.js:64:27:64:36 | assignment | provenance |  |
+| bad-code-sanitization.js:63:31:63:49 | JSON.stringify(key) | bad-code-sanitization.js:63:11:63:20 | assignment | provenance |  |
 nodes
 | bad-code-sanitization.js:2:12:2:90 | /^[_$a- ... key)}]` | semmle.label | /^[_$a- ... key)}]` |
 | bad-code-sanitization.js:2:69:2:87 | JSON.stringify(key) | semmle.label | JSON.stringify(key) |
@@ -32,7 +32,7 @@ nodes
 | bad-code-sanitization.js:52:28:52:62 | JSON.st ... bble")) | semmle.label | JSON.st ... bble")) |
 | bad-code-sanitization.js:54:29:54:63 | JSON.st ... bble")) | semmle.label | JSON.st ... bble")) |
 | bad-code-sanitization.js:58:29:58:49 | JSON.st ... (taint) | semmle.label | JSON.st ... (taint) |
-| bad-code-sanitization.js:63:11:63:55 | assignment | semmle.label | assignment |
+| bad-code-sanitization.js:63:11:63:20 | assignment | semmle.label | assignment |
 | 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
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 bddb28457097..f6a518629d2e 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
@@ -7,19 +7,19 @@
 | 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 |  |
-| example.js:10:19:10:37 | JSON.parse(ev.data) | example.js:10:9:10:37 | message | provenance |  |
+| example.js:10:9:10:15 | message | example.js:13:12:13:18 | message | provenance |  |
+| example.js:10:19:10:37 | JSON.parse(ev.data) | example.js:10:9:10:15 | message | provenance |  |
 | example.js:10:30:10:31 | ev | example.js:10:30:10:36 | ev.data | provenance | Config |
 | example.js:10:30:10:36 | ev.data | example.js:10:19:10:37 | JSON.parse(ev.data) | provenance | Config |
 | example.js:13:12:13:18 | message | example.js:13:12:13:23 | message.name | provenance | Config |
 | example.js:13:12:13:23 | message.name | example.js:13:5:13:24 | window[message.name] | provenance | Config |
 | tst.js:3:37:3:38 | ev | tst.js:4:30:4:31 | ev | provenance |  |
 | tst.js:3:37:3:38 | ev | tst.js:15:12:15:13 | ev | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:5:12:5:18 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:6:16:6:22 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:11:7:11:13 | message | provenance |  |
-| tst.js:4:9:4:37 | message | tst.js:21:17:21:23 | message | provenance |  |
-| tst.js:4:19:4:37 | JSON.parse(ev.data) | tst.js:4:9:4:37 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:5:12:5:18 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:6:16:6:22 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:11:7:11:13 | message | provenance |  |
+| tst.js:4:9:4:15 | message | tst.js:21:17:21:23 | message | provenance |  |
+| tst.js:4:19:4:37 | JSON.parse(ev.data) | tst.js:4:9:4:15 | message | provenance |  |
 | tst.js:4:30:4:31 | ev | tst.js:4:30:4:36 | ev.data | provenance | Config |
 | tst.js:4:30:4:36 | ev.data | tst.js:4:19:4:37 | JSON.parse(ev.data) | provenance | Config |
 | tst.js:5:12:5:18 | message | tst.js:5:12:5:23 | message.name | provenance | Config |
@@ -34,7 +34,7 @@ edges
 | tst.js:21:17:21:28 | message.name | tst.js:21:12:21:28 | '' + message.name | provenance | Config |
 nodes
 | example.js:9:37:9:38 | ev | semmle.label | ev |
-| example.js:10:9:10:37 | message | semmle.label | message |
+| example.js:10:9:10:15 | message | semmle.label | message |
 | example.js:10:19:10:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | example.js:10:30:10:31 | ev | semmle.label | ev |
 | example.js:10:30:10:36 | ev.data | semmle.label | ev.data |
@@ -42,7 +42,7 @@ nodes
 | example.js:13:12:13:18 | message | semmle.label | message |
 | example.js:13:12:13:23 | message.name | semmle.label | message.name |
 | tst.js:3:37:3:38 | ev | semmle.label | ev |
-| tst.js:4:9:4:37 | message | semmle.label | message |
+| tst.js:4:9:4:15 | message | semmle.label | message |
 | tst.js:4:19:4:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:4:30:4:31 | ev | semmle.label | ev |
 | tst.js:4:30:4:36 | ev.data | semmle.label | ev.data |
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 162ff1c05993..3f1ac1685d79 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
@@ -13,8 +13,8 @@
 | 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:274:6:274:8 | arr | tst.js:275:9:275:11 | arr | provenance |  |
+| tst.js:274:12:274:94 | s().val ... g , '') | tst.js:274:6:274:8 | 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,'') |
@@ -24,7 +24,7 @@ nodes
 | tst.js:253:21:253:45 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
 | tst.js:254:32:254:56 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
 | tst.js:270:61:270:85 | s().rep ... /g, '') | semmle.label | s().rep ... /g, '') |
-| tst.js:274:6:274:94 | arr | semmle.label | arr |
+| tst.js:274:6:274:8 | arr | semmle.label | arr |
 | tst.js:274:12:274:94 | s().val ... g , '') | semmle.label | s().val ... g , '') |
 | tst.js:275:9:275:11 | arr | semmle.label | arr |
 | tst.js:275:9:275:21 | arr.join(" ") | semmle.label | arr.join(" ") |
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 42417a6ac8de..6b192117593a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-117/LogInjection.expected
@@ -24,35 +24,35 @@
 | 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 |  |
-| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:36 | q | provenance |  |
+| logInjectionBad.js:19:9:19:9 | q | logInjectionBad.js:20:20:20:20 | q | provenance |  |
+| logInjectionBad.js:19:13:19:36 | url.par ... , true) | logInjectionBad.js:19:9:19:9 | q | provenance |  |
 | logInjectionBad.js:19:23:19:29 | req.url | logInjectionBad.js:19:13:19:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:22:34:22:41 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:23:37:23:44 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:24:35:24:42 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:25:36:25:43 | username | provenance |  |
-| logInjectionBad.js:20:9:20:35 | username | logInjectionBad.js:28:24:28:31 | username | provenance |  |
-| logInjectionBad.js:20:20:20:20 | q | logInjectionBad.js:20:9:20:35 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:22:34:22:41 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:23:37:23:44 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:24:35:24:42 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:25:36:25:43 | username | provenance |  |
+| logInjectionBad.js:20:9:20:16 | username | logInjectionBad.js:28:24:28:31 | username | provenance |  |
+| logInjectionBad.js:20:20:20:20 | q | logInjectionBad.js:20:9:20:16 | username | provenance |  |
 | logInjectionBad.js:22:34:22:41 | username | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | provenance |  |
 | logInjectionBad.js:28:9:28:32 | exceptional return of check_u ... ername) | logInjectionBad.js:29:14:29:18 | error | provenance |  |
 | logInjectionBad.js:28:24:28:31 | username | logInjectionBad.js:7:25:7:32 | username | provenance |  |
 | logInjectionBad.js:28:24:28:31 | username | logInjectionBad.js:28:9:28:32 | exceptional return of check_u ... ername) | provenance |  |
 | logInjectionBad.js:29:14:29:18 | error | logInjectionBad.js:30:42:30:46 | error | provenance |  |
 | logInjectionBad.js:30:42:30:46 | error | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | provenance |  |
-| logInjectionBad.js:46:9:46:36 | q | logInjectionBad.js:47:20:47:20 | q | provenance |  |
-| logInjectionBad.js:46:13:46:36 | url.par ... , true) | logInjectionBad.js:46:9:46:36 | q | provenance |  |
+| logInjectionBad.js:46:9:46:9 | q | logInjectionBad.js:47:20:47:20 | q | provenance |  |
+| logInjectionBad.js:46:13:46:36 | url.par ... , true) | logInjectionBad.js:46:9:46:9 | q | provenance |  |
 | logInjectionBad.js:46:23:46:29 | req.url | logInjectionBad.js:46:13:46:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:49:46:49:53 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:50:39:50:46 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:51:48:51:55 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:52:37:52:44 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:53:27:53:34 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:54:43:54:50 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:55:48:55:55 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:56:47:56:54 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:57:40:57:47 | username | provenance |  |
-| logInjectionBad.js:47:9:47:35 | username | logInjectionBad.js:58:50:58:57 | username | provenance |  |
-| logInjectionBad.js:47:20:47:20 | q | logInjectionBad.js:47:9:47:35 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:49:46:49:53 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:50:39:50:46 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:51:48:51:55 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:52:37:52:44 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:53:27:53:34 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:54:43:54:50 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:55:48:55:55 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:56:47:56:54 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:57:40:57:47 | username | provenance |  |
+| logInjectionBad.js:47:9:47:16 | username | logInjectionBad.js:58:50:58:57 | username | provenance |  |
+| logInjectionBad.js:47:20:47:20 | q | logInjectionBad.js:47:9:47:16 | username | provenance |  |
 | logInjectionBad.js:49:46:49:53 | username | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | provenance |  |
 | logInjectionBad.js:50:39:50:46 | username | logInjectionBad.js:50:18:50:47 | colors. ... ername) | provenance |  |
 | logInjectionBad.js:51:27:51:56 | colors. ... ername) | logInjectionBad.js:51:18:51:61 | wrapAns ... e), 20) | provenance |  |
@@ -68,18 +68,18 @@ edges
 | logInjectionBad.js:57:40:57:47 | username | logInjectionBad.js:57:17:57:48 | chalk.u ... ername) | provenance |  |
 | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | provenance |  |
 | logInjectionBad.js:58:50:58:57 | username | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | provenance |  |
-| logInjectionBad.js:63:9:63:36 | q | logInjectionBad.js:64:20:64:20 | q | provenance |  |
-| logInjectionBad.js:63:13:63:36 | url.par ... , true) | logInjectionBad.js:63:9:63:36 | q | provenance |  |
+| logInjectionBad.js:63:9:63:9 | q | logInjectionBad.js:64:20:64:20 | q | provenance |  |
+| logInjectionBad.js:63:13:63:36 | url.par ... , true) | logInjectionBad.js:63:9:63:9 | q | provenance |  |
 | logInjectionBad.js:63:23:63:29 | req.url | logInjectionBad.js:63:13:63:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:64:9:64:35 | username | logInjectionBad.js:66:35:66:42 | username | provenance |  |
-| logInjectionBad.js:64:20:64:20 | q | logInjectionBad.js:64:9:64:35 | username | provenance |  |
+| logInjectionBad.js:64:9:64:16 | username | logInjectionBad.js:66:35:66:42 | username | provenance |  |
+| logInjectionBad.js:64:20:64:20 | q | logInjectionBad.js:64:9:64:16 | username | provenance |  |
 | logInjectionBad.js:66:35:66:42 | username | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | provenance |  |
-| logInjectionBad.js:72:9:72:36 | q | logInjectionBad.js:73:20:73:20 | q | provenance |  |
-| logInjectionBad.js:72:13:72:36 | url.par ... , true) | logInjectionBad.js:72:9:72:36 | q | provenance |  |
+| logInjectionBad.js:72:9:72:9 | q | logInjectionBad.js:73:20:73:20 | q | provenance |  |
+| logInjectionBad.js:72:13:72:36 | url.par ... , true) | logInjectionBad.js:72:9:72:9 | q | provenance |  |
 | logInjectionBad.js:72:23:72:29 | req.url | logInjectionBad.js:72:13:72:36 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:73:9:73:35 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
-| logInjectionBad.js:73:9:73:35 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
-| logInjectionBad.js:73:20:73:20 | q | logInjectionBad.js:73:9:73:35 | username | provenance |  |
+| logInjectionBad.js:73:9:73:16 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
+| logInjectionBad.js:73:9:73:16 | username | logInjectionBad.js:75:15:75:22 | username | provenance |  |
+| logInjectionBad.js:73:20:73:20 | q | logInjectionBad.js:73:9:73:16 | username | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:77:5:85:5 | functio ... ;\\n    } [username] | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:87:5:94:5 | functio ... ;\\n    } [username] | provenance |  |
 | logInjectionBad.js:75:15:75:22 | username | logInjectionBad.js:96:5:103:5 | functio ... ;\\n    } [username] | provenance |  |
@@ -88,21 +88,21 @@ edges
 | logInjectionBad.js:87:5:94:5 | functio ... ;\\n    } [username] | logInjectionBad.js:91:26:91:33 | username | provenance |  |
 | logInjectionBad.js:96:5:103:5 | functio ... ;\\n    } [username] | logInjectionBad.js:99:26:99:33 | username | provenance |  |
 | logInjectionBad.js:105:5:118:5 | functio ... ;\\n    } [username] | logInjectionBad.js:113:37:113:44 | username | provenance |  |
-| logInjectionBad.js:122:9:122:58 | username | logInjectionBad.js:123:20:123:27 | username | provenance |  |
-| logInjectionBad.js:122:20:122:43 | url.par ... , true) | logInjectionBad.js:122:9:122:58 | username | provenance |  |
+| logInjectionBad.js:122:9:122:16 | username | logInjectionBad.js:123:20:123:27 | username | provenance |  |
+| logInjectionBad.js:122:20:122:43 | url.par ... , true) | logInjectionBad.js:122:9:122:16 | username | provenance |  |
 | logInjectionBad.js:122:30:122:36 | req.url | logInjectionBad.js:122:20:122:43 | url.par ... , true) | provenance |  |
-| logInjectionBad.js:123:9:123:46 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr | provenance |  |
+| logInjectionBad.js:123:9:123:16 | otherStr | logInjectionBad.js:124:17:124:24 | otherStr | provenance |  |
 | logInjectionBad.js:123:20:123:27 | username | logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | provenance |  |
-| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | logInjectionBad.js:123:9:123:46 | otherStr | provenance |  |
+| logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | logInjectionBad.js:123:9:123:16 | otherStr | provenance |  |
 | logInjectionBad.js:128:20:128:43 | url.par ... , true) | logInjectionBad.js:129:42:129:50 | RegExp.$1 | provenance |  |
 | logInjectionBad.js:128:30:128:36 | req.url | logInjectionBad.js:128:20:128:43 | url.par ... , true) | provenance |  |
 nodes
 | logInjectionBad.js:7:25:7:32 | username | semmle.label | username |
 | logInjectionBad.js:8:38:8:45 | username | semmle.label | username |
-| logInjectionBad.js:19:9:19:36 | q | semmle.label | q |
+| logInjectionBad.js:19:9:19:9 | q | semmle.label | q |
 | logInjectionBad.js:19:13:19:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:19:23:19:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:20:9:20:35 | username | semmle.label | username |
+| logInjectionBad.js:20:9:20:16 | username | semmle.label | username |
 | logInjectionBad.js:20:20:20:20 | q | semmle.label | q |
 | logInjectionBad.js:22:18:22:43 | `[INFO] ... rname}` | semmle.label | `[INFO] ... rname}` |
 | logInjectionBad.js:22:34:22:41 | username | semmle.label | username |
@@ -114,10 +114,10 @@ nodes
 | logInjectionBad.js:29:14:29:18 | error | semmle.label | error |
 | logInjectionBad.js:30:23:30:49 | `[ERROR ... rror}"` | semmle.label | `[ERROR ... rror}"` |
 | logInjectionBad.js:30:42:30:46 | error | semmle.label | error |
-| logInjectionBad.js:46:9:46:36 | q | semmle.label | q |
+| logInjectionBad.js:46:9:46:9 | q | semmle.label | q |
 | logInjectionBad.js:46:13:46:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:46:23:46:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:47:9:47:35 | username | semmle.label | username |
+| logInjectionBad.js:47:9:47:16 | username | semmle.label | username |
 | logInjectionBad.js:47:20:47:20 | q | semmle.label | q |
 | logInjectionBad.js:49:18:49:54 | ansiCol ... ername) | semmle.label | ansiCol ... ername) |
 | logInjectionBad.js:49:46:49:53 | username | semmle.label | username |
@@ -144,17 +144,17 @@ nodes
 | logInjectionBad.js:58:17:58:59 | stripAn ... rname)) | semmle.label | stripAn ... rname)) |
 | logInjectionBad.js:58:27:58:58 | chalk.u ... ername) | semmle.label | chalk.u ... ername) |
 | logInjectionBad.js:58:50:58:57 | username | semmle.label | username |
-| logInjectionBad.js:63:9:63:36 | q | semmle.label | q |
+| logInjectionBad.js:63:9:63:9 | q | semmle.label | q |
 | logInjectionBad.js:63:13:63:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:63:23:63:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:64:9:64:35 | username | semmle.label | username |
+| logInjectionBad.js:64:9:64:16 | username | semmle.label | username |
 | logInjectionBad.js:64:20:64:20 | q | semmle.label | q |
 | logInjectionBad.js:66:17:66:43 | prettyj ... ername) | semmle.label | prettyj ... ername) |
 | logInjectionBad.js:66:35:66:42 | username | semmle.label | username |
-| logInjectionBad.js:72:9:72:36 | q | semmle.label | q |
+| logInjectionBad.js:72:9:72:9 | q | semmle.label | q |
 | logInjectionBad.js:72:13:72:36 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:72:23:72:29 | req.url | semmle.label | req.url |
-| logInjectionBad.js:73:9:73:35 | username | semmle.label | username |
+| logInjectionBad.js:73:9:73:16 | username | semmle.label | username |
 | logInjectionBad.js:73:20:73:20 | q | semmle.label | q |
 | logInjectionBad.js:75:15:75:22 | username | semmle.label | username |
 | logInjectionBad.js:75:15:75:22 | username | semmle.label | username |
@@ -166,10 +166,10 @@ nodes
 | logInjectionBad.js:99:26:99:33 | username | semmle.label | username |
 | logInjectionBad.js:105:5:118:5 | functio ... ;\\n    } [username] | semmle.label | functio ... ;\\n    } [username] |
 | logInjectionBad.js:113:37:113:44 | username | semmle.label | username |
-| logInjectionBad.js:122:9:122:58 | username | semmle.label | username |
+| logInjectionBad.js:122:9:122:16 | username | semmle.label | username |
 | logInjectionBad.js:122:20:122:43 | url.par ... , true) | semmle.label | url.par ... , true) |
 | logInjectionBad.js:122:30:122:36 | req.url | semmle.label | req.url |
-| logInjectionBad.js:123:9:123:46 | otherStr | semmle.label | otherStr |
+| logInjectionBad.js:123:9:123:16 | otherStr | semmle.label | otherStr |
 | logInjectionBad.js:123:20:123:27 | username | semmle.label | username |
 | logInjectionBad.js:123:20:123:43 | usernam ... (/.*/g) | semmle.label | usernam ... (/.*/g) |
 | logInjectionBad.js:124:17:124:24 | otherStr | semmle.label | otherStr |
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 bde27032d4f2..74324c0ebcfd 100644
--- a/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-200/FileAccessToHttp.expected
@@ -13,28 +13,28 @@
 | 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:4:5:4:11 | content | FileAccessToHttp.js:9:23:9:29 | content | provenance |  |
+| FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | FileAccessToHttp.js:4:5:4:11 | 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:16:11:16:17 | content | FileAccessToHttp.js:22:27:22:33 | content | provenance |  |
+| FileAccessToHttp.js:16:21:16:56 | await f ... "utf8") | FileAccessToHttp.js:16:11:16:17 | 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:34:9:34:14 | buffer | FileAccessToHttp.js:40:25:40:30 | buffer | provenance |  |
+| FileAccessToHttp.js:34:18:34:57 | [Buffer ... (1024)] | FileAccessToHttp.js:34:9:34:14 | 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:43:9:43:15 | buffer1 | FileAccessToHttp.js:49:25:49:31 | buffer1 | provenance |  |
+| FileAccessToHttp.js:43:19:43:36 | Buffer.alloc(1024) | FileAccessToHttp.js:43:9:43:15 | 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:52:9:52:15 | buffer2 | FileAccessToHttp.js:53:17:53:23 | buffer2 | provenance |  |
+| FileAccessToHttp.js:52:19:52:36 | Buffer.alloc(1024) | FileAccessToHttp.js:52:9:52:15 | 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 |  |
@@ -42,28 +42,28 @@ edges
 | 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:12:13:12:18 | buffer | bufferRead.js:13:21:13:26 | buffer | provenance |  |
+| bufferRead.js:12:13:12:18 | buffer | bufferRead.js:13:32:13:37 | buffer | provenance |  |
+| bufferRead.js:12:22:12:43 | new Buf ... s.size) | bufferRead.js:12:13:12:18 | 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:32:21:32:28 | postData | provenance |  |
+| bufferRead.js:15:15:15:22 | 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 |  |
+| bufferRead.js:15:26:15:62 | buffer. ... esRead) | bufferRead.js:15:15:15:22 | 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:7:9:15 | post_data | googlecompiler.js:37:18:37:26 | post_data | provenance |  |
+| googlecompiler.js:9:19:15:4 | queryst ... dy\\n  }) | googlecompiler.js:9:7:9:15 | 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:25:18:25:18 | s | provenance |  |
+| readFileSync.js:5:5:5:8 | data | readFileSync.js:7:11:7:14 | data | provenance |  |
+| readFileSync.js:5:12:5:39 | fs.read ... t.txt") | readFileSync.js:5:5:5:8 | data | provenance |  |
+| readFileSync.js:7:7:7:7 | 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:29:19:29:23 | chunk | provenance |  |
-| readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:13:13:13:35 | chunk | provenance |  |
+| readFileSync.js:7:11:7:25 | data.toString() | readFileSync.js:7:7:7:7 | s | provenance |  |
+| readStreamRead.js:13:13:13:17 | chunk | readStreamRead.js:29:19:29:23 | chunk | provenance |  |
+| readStreamRead.js:13:21:13:35 | readable.read() | readStreamRead.js:13:13:13:17 | 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 |  |
 | request.js:13:18:13:24 | xmlData | request.js:22:11:22:17 | xmlData | provenance |  |
@@ -73,14 +73,14 @@ edges
 | request.js:43:51:43:54 | data | request.js:50:13:50:16 | data | provenance |  |
 | request.js:50:13:50:16 | data | request.js:13:18:13:24 | xmlData | provenance |  |
 | sentAsHeaders.js:10:79:10:84 | buffer | sentAsHeaders.js:11:23:11:28 | buffer | provenance |  |
-| sentAsHeaders.js:11:13:11:59 | content | sentAsHeaders.js:12:19:12:25 | content | provenance |  |
+| sentAsHeaders.js:11:13:11:19 | content | sentAsHeaders.js:12:19:12:25 | content | provenance |  |
 | sentAsHeaders.js:11:23:11:28 | buffer | sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | provenance |  |
-| sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | sentAsHeaders.js:11:13:11:59 | content | provenance |  |
-| sentAsHeaders.js:12:9:12:81 | content | sentAsHeaders.js:18:47:18:53 | content | provenance |  |
-| sentAsHeaders.js:12:9:12:81 | content | sentAsHeaders.js:24:47:24:53 | content | provenance |  |
+| sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | sentAsHeaders.js:11:13:11:19 | content | provenance |  |
+| sentAsHeaders.js:12:9:12:15 | content | sentAsHeaders.js:18:47:18:53 | content | provenance |  |
+| sentAsHeaders.js:12:9:12:15 | content | sentAsHeaders.js:24:47:24:53 | content | provenance |  |
 | sentAsHeaders.js:12:19:12:25 | content | sentAsHeaders.js:12:19:12:74 | content ... =", "") | provenance |  |
 | sentAsHeaders.js:12:19:12:74 | content ... =", "") | sentAsHeaders.js:12:19:12:81 | content ... .trim() | provenance |  |
-| sentAsHeaders.js:12:19:12:81 | content ... .trim() | sentAsHeaders.js:12:9:12:81 | content | provenance |  |
+| sentAsHeaders.js:12:19:12:81 | content ... .trim() | sentAsHeaders.js:12:9:12:15 | content | provenance |  |
 | sentAsHeaders.js:18:20:18:55 | { Refer ... ntent } [Referer] | sentAsHeaders.js:14:20:19:9 | {\\n      ...       } | provenance |  |
 | sentAsHeaders.js:18:31:18:53 | "http:/ ... content | sentAsHeaders.js:18:20:18:55 | { Refer ... ntent } [Referer] | provenance |  |
 | sentAsHeaders.js:18:47:18:53 | content | sentAsHeaders.js:18:31:18:53 | "http:/ ... content | provenance |  |
@@ -88,22 +88,22 @@ edges
 | sentAsHeaders.js:24:31:24:53 | "http:/ ... content | sentAsHeaders.js:24:20:24:55 | { Refer ... ntent } [Referer] | provenance |  |
 | sentAsHeaders.js:24:47:24:53 | content | sentAsHeaders.js:24:31:24:53 | "http:/ ... content | provenance |  |
 nodes
-| FileAccessToHttp.js:4:5:4:47 | content | semmle.label | content |
+| FileAccessToHttp.js:4:5:4:11 | content | semmle.label | content |
 | FileAccessToHttp.js:4:15:4:47 | fs.read ... "utf8") | semmle.label | fs.read ... "utf8") |
 | 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:11:16:17 | 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:9:34:14 | 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:9:43:15 | 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] |
@@ -111,7 +111,7 @@ nodes
 | 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:9:52:15 | 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    } |
@@ -120,29 +120,29 @@ nodes
 | 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:13:12:18 | 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 |
 | bufferRead.js:13:32:13:37 | buffer | semmle.label | buffer |
-| bufferRead.js:15:15:15:62 | postData | semmle.label | postData |
+| bufferRead.js:15:15:15:22 | 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: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:7:9:15 | 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:5:5:8 | 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:7:7:7 | 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:25:18:25:18 | s | semmle.label | s |
-| readStreamRead.js:13:13:13:35 | chunk | semmle.label | chunk |
+| readStreamRead.js:13:13:13:17 | chunk | semmle.label | chunk |
 | readStreamRead.js:13:21:13:35 | readable.read() | semmle.label | readable.read() |
 | readStreamRead.js:29:19:29:23 | chunk | semmle.label | chunk |
 | request.js:6:19:6:26 | jsonData | semmle.label | jsonData |
@@ -156,10 +156,10 @@ nodes
 | request.js:43:51:43:54 | data | semmle.label | data |
 | request.js:50:13:50:16 | data | semmle.label | data |
 | sentAsHeaders.js:10:79:10:84 | buffer | semmle.label | buffer |
-| sentAsHeaders.js:11:13:11:59 | content | semmle.label | content |
+| sentAsHeaders.js:11:13:11:19 | content | semmle.label | content |
 | sentAsHeaders.js:11:23:11:28 | buffer | semmle.label | buffer |
 | sentAsHeaders.js:11:23:11:59 | buffer. ... esRead) | semmle.label | buffer. ... esRead) |
-| sentAsHeaders.js:12:9:12:81 | content | semmle.label | content |
+| sentAsHeaders.js:12:9:12:15 | content | semmle.label | content |
 | sentAsHeaders.js:12:19:12:25 | content | semmle.label | content |
 | sentAsHeaders.js:12:19:12:74 | content ... =", "") | semmle.label | content ... =", "") |
 | sentAsHeaders.js:12:19:12:81 | content ... .trim() | semmle.label | content ... .trim() |
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 37c0773b6974..2e8c7462e2de 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/BuildArtifactLeak.expected
@@ -1,14 +1,14 @@
 edges
 | 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 |  |
+| build-leaks.js:13:11:13:13 | raw | build-leaks.js:22:36:22:38 | raw | provenance |  |
+| build-leaks.js:13:17:19:10 | Object. ...      }) | build-leaks.js:13:11:13:13 | raw | provenance |  |
 | build-leaks.js:15:13:15:15 | [post update] env | build-leaks.js:16:20:16:22 | env | provenance |  |
 | build-leaks.js:15:24:15:34 | process.env | build-leaks.js:15:13:15:15 | [post update] env | provenance | Config |
 | build-leaks.js:16:20:16:22 | env | build-leaks.js:13:17:19:10 | Object. ...      }) | provenance |  |
 | build-leaks.js:16:20:16:22 | env | build-leaks.js:22:49:22:51 | env | provenance |  |
-| build-leaks.js:21:11:26:5 | stringifed [process.env] | build-leaks.js:30:22:30:31 | stringifed [process.env] | provenance |  |
-| build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | build-leaks.js:21:11:26:5 | stringifed [process.env] | provenance |  |
+| build-leaks.js:21:11:21:20 | stringifed [process.env] | build-leaks.js:30:22:30:31 | stringifed [process.env] | provenance |  |
+| build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | build-leaks.js:21:11:21:20 | stringifed [process.env] | provenance |  |
 | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | provenance |  |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | provenance | Config |
 | build-leaks.js:22:36:22:38 | raw | build-leaks.js:22:49:22:51 | env | provenance | Config |
@@ -19,20 +19,20 @@ edges
 | build-leaks.js:28:12:31:5 | {\\n      ... d\\n    } [stringified, process.env] | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | provenance |  |
 | build-leaks.js:30:22:30:31 | stringifed [process.env] | build-leaks.js:28:12:31:5 | {\\n      ... d\\n    } [stringified, process.env] | provenance |  |
 | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | build-leaks.js:34:26:34:57 | getEnv( ... ngified | provenance |  |
-| build-leaks.js:40:9:40:60 | pw | build-leaks.js:41:82:41:83 | pw | provenance |  |
-| build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:40:9:40:60 | pw | provenance |  |
+| build-leaks.js:40:9:40:10 | pw | build-leaks.js:41:82:41:83 | pw | provenance |  |
+| build-leaks.js:40:14:40:60 | url.par ... assword | build-leaks.js:40:9:40:10 | pw | provenance |  |
 | 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 | {\\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 |
+| build-leaks.js:13:11:13:13 | raw | semmle.label | raw |
 | build-leaks.js:13:17:19:10 | Object. ...      }) | semmle.label | Object. ...      }) |
 | build-leaks.js:15:13:15:15 | [post update] env | semmle.label | [post update] env |
 | build-leaks.js:15:24:15:34 | process.env | semmle.label | process.env |
 | build-leaks.js:16:20:16:22 | env | semmle.label | env |
-| build-leaks.js:21:11:26:5 | stringifed [process.env] | semmle.label | stringifed [process.env] |
+| build-leaks.js:21:11:21:20 | stringifed [process.env] | semmle.label | stringifed [process.env] |
 | build-leaks.js:21:24:26:5 | {\\n      ... )\\n    } [process.env] | semmle.label | {\\n      ... )\\n    } [process.env] |
 | build-leaks.js:22:24:25:14 | Object. ...  }, {}) | semmle.label | Object. ...  }, {}) |
 | build-leaks.js:22:36:22:38 | raw | semmle.label | raw |
@@ -45,7 +45,7 @@ nodes
 | build-leaks.js:30:22:30:31 | stringifed [process.env] | semmle.label | stringifed [process.env] |
 | build-leaks.js:34:26:34:45 | getEnv('production') [stringified, process.env] | semmle.label | getEnv('production') [stringified, process.env] |
 | build-leaks.js:34:26:34:57 | getEnv( ... ngified | semmle.label | getEnv( ... ngified |
-| build-leaks.js:40:9:40:60 | pw | semmle.label | pw |
+| build-leaks.js:40:9:40:10 | pw | semmle.label | pw |
 | build-leaks.js:40:14:40:60 | url.par ... assword | semmle.label | url.par ... assword |
 | build-leaks.js:41:43:41:86 | { "proc ... y(pw) } | semmle.label | { "proc ... y(pw) } |
 | build-leaks.js:41:67:41:84 | JSON.stringify(pw) | semmle.label | JSON.stringify(pw) |
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 491c4359fe72..af9e0f485c2d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextLogging.expected
@@ -46,18 +46,18 @@ edges
 | 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      ... ]\\n    } [password] | passwords.js:18:9:20:5 | obj1 [password] | provenance |  |
+| passwords.js:18:9:18:12 | obj1 [password] | passwords.js:21:17:21:20 | obj1 | provenance |  |
+| passwords.js:18:16:20:5 | {\\n      ... ]\\n    } [password] | passwords.js:18:9:18:12 | 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      ... ]\\n    } [x] | passwords.js:23:9:25:5 | obj2 [x] | provenance |  |
+| passwords.js:23:9:23:12 | obj2 [x] | passwords.js:26:17:26:20 | obj2 | provenance |  |
+| passwords.js:23:16:25:5 | {\\n      ... ]\\n    } [x] | passwords.js:23:9:23:12 | 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:9:77:12 | 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:12 | temp [encryptedPassword] | provenance |  |
 | passwords.js:77:37:77:53 | req.body.password | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | provenance |  |
 | passwords.js:78:17:78:20 | temp [encryptedPassword] | passwords.js:78:17:78:38 | temp.en ... assword | provenance |  |
-| passwords.js:80:9:80:25 | secret | passwords.js:81:24:81:29 | secret | provenance |  |
-| passwords.js:80:18:80:25 | password | passwords.js:80:9:80:25 | secret | provenance |  |
+| passwords.js:80:9:80:14 | secret | passwords.js:81:24:81:29 | secret | provenance |  |
+| passwords.js:80:18:80:25 | password | passwords.js:80:9:80:14 | secret | provenance |  |
 | passwords.js:81:24:81:29 | secret | passwords.js:81:17:81:31 | `pw: ${secret}` | provenance |  |
 | passwords.js:93:39:93:46 | password | passwords.js:93:21:93:46 | "Passwo ... assword | provenance |  |
 | passwords.js:98:39:98:46 | password | passwords.js:98:21:98:46 | "Passwo ... assword | provenance |  |
@@ -69,14 +69,14 @@ edges
 | passwords.js:122:31:122:49 | password.toString() | passwords.js:122:17:122:49 | name +  ... tring() | provenance |  |
 | passwords.js:123:31:123:38 | password | passwords.js:123:31:123:48 | password.valueOf() | provenance |  |
 | passwords.js:123:31:123:48 | password.valueOf() | passwords.js:123:17:123:48 | name +  ... lueOf() | provenance |  |
-| passwords.js:127:9:132:5 | config [password] | passwords.js:135:17:135:22 | config | provenance |  |
-| passwords.js:127:9:132:5 | config [x] | passwords.js:135:17:135:22 | config | provenance |  |
-| 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:127:9:127:14 | config [password] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [x] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [x] | passwords.js:136:17:136:22 | config [x] | provenance |  |
+| passwords.js:127:9:127:14 | config [y] | passwords.js:135:17:135:22 | config | provenance |  |
+| passwords.js:127:9:127:14 | config [y] | passwords.js:137:17:137:22 | config [y] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [password] | passwords.js:127:9:127:14 | config [password] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [x] | passwords.js:127:9:127:14 | config [x] | provenance |  |
+| passwords.js:127:18:132:5 | {\\n      ... ]\\n    } [y] | passwords.js:127:9:127:14 | 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 |  |
@@ -90,8 +90,8 @@ edges
 | passwords.js:142:26:142:34 | arguments [0] | 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: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      ... ]\\n    } [x] | passwords.js:146:9:148:5 | config [x] | provenance |  |
+| passwords.js:146:9:146:14 | config [x] | passwords.js:149:21:149:26 | config [x] | provenance |  |
+| passwords.js:146:18:148:5 | {\\n      ... ]\\n    } [x] | passwords.js:146:9:146:14 | 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 |  |
@@ -102,9 +102,9 @@ edges
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | provenance | Config |
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments | provenance | Config |
 | passwords.js:150:21:150:31 | process.env | passwords.js:142:26:142:34 | arguments [0] | provenance |  |
-| passwords.js:152:9:152:63 | procdesc | passwords.js:154:21:154:28 | procdesc | provenance |  |
+| passwords.js:152:9:152:16 | procdesc | passwords.js:154:21:154:28 | procdesc | provenance |  |
 | passwords.js:152:20:152:44 | Util.in ... ss.env) | passwords.js:152:20:152:63 | Util.in ... /g, '') | provenance |  |
-| passwords.js:152:20:152:63 | Util.in ... /g, '') | passwords.js:152:9:152:63 | procdesc | provenance |  |
+| passwords.js:152:20:152:63 | Util.in ... /g, '') | passwords.js:152:9:152:16 | procdesc | provenance |  |
 | passwords.js:152:33:152:43 | process.env | passwords.js:152:20:152:44 | Util.in ... ss.env) | provenance |  |
 | passwords.js:154:21:154:28 | procdesc | passwords.js:142:26:142:34 | arguments | provenance |  |
 | passwords.js:154:21:154:28 | procdesc | passwords.js:142:26:142:34 | arguments | provenance | Config |
@@ -131,20 +131,20 @@ nodes
 | passwords.js:14:31:14:38 | password | semmle.label | password |
 | 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:9:18:12 | obj1 [password] | semmle.label | obj1 [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:9:23:12 | obj2 [x] | semmle.label | obj2 [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] |
+| passwords.js:77:9:77:12 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
 | passwords.js:77:16:77:55 | { encry ... sword } [encryptedPassword] | semmle.label | { encry ... sword } [encryptedPassword] |
 | passwords.js:77:37:77:53 | req.body.password | semmle.label | req.body.password |
 | passwords.js:78:17:78:20 | temp [encryptedPassword] | semmle.label | temp [encryptedPassword] |
 | passwords.js:78:17:78:38 | temp.en ... assword | semmle.label | temp.en ... assword |
-| passwords.js:80:9:80:25 | secret | semmle.label | secret |
+| passwords.js:80:9:80:14 | secret | semmle.label | secret |
 | passwords.js:80:18:80:25 | password | semmle.label | password |
 | passwords.js:81:17:81:31 | `pw: ${secret}` | semmle.label | `pw: ${secret}` |
 | passwords.js:81:24:81:29 | secret | semmle.label | secret |
@@ -166,9 +166,9 @@ nodes
 | passwords.js:123:17:123:48 | name +  ... lueOf() | semmle.label | name +  ... lueOf() |
 | passwords.js:123:31:123:38 | password | semmle.label | password |
 | passwords.js:123:31:123:48 | password.valueOf() | semmle.label | password.valueOf() |
-| 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:9:127:14 | config [password] | semmle.label | config [password] |
+| passwords.js:127:9:127:14 | config [x] | semmle.label | config [x] |
+| passwords.js:127:9:127:14 | 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] |
@@ -187,13 +187,13 @@ nodes
 | passwords.js:142:26:142:34 | arguments [0] | semmle.label | arguments [0] |
 | 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:9:146:14 | config [x] | semmle.label | config [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 |
 | passwords.js:150:21:150:31 | process.env | semmle.label | process.env |
-| passwords.js:152:9:152:63 | procdesc | semmle.label | procdesc |
+| passwords.js:152:9:152:16 | procdesc | semmle.label | procdesc |
 | passwords.js:152:20:152:44 | Util.in ... ss.env) | semmle.label | Util.in ... ss.env) |
 | passwords.js:152:20:152:63 | Util.in ... /g, '') | semmle.label | Util.in ... /g, '') |
 | passwords.js:152:33:152:43 | process.env | semmle.label | process.env |
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 fcb6c03d006a..035ea1cae57d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-312/CleartextStorage.expected
@@ -10,17 +10,17 @@
 | 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:5:7:5:8 | pw | CleartextStorage2.js:7:33:7:34 | pw | provenance |  |
+| CleartextStorage2.js:5:12:5:58 | url.par ... assword | CleartextStorage2.js:5:7:5:8 | 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:6:26:6:27 | pw | provenance |  |
-| CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:5:7:5:40 | pw | provenance |  |
+| CleartextStorage.js:5:7:5:8 | pw | CleartextStorage.js:6:26:6:27 | pw | provenance |  |
+| CleartextStorage.js:5:12:5:40 | req.par ... sword") | CleartextStorage.js:5:7:5:8 | pw | provenance |  |
 nodes
-| CleartextStorage2.js:5:7:5:58 | pw | semmle.label | pw |
+| CleartextStorage2.js:5:7:5:8 | pw | semmle.label | pw |
 | CleartextStorage2.js:5:12:5:58 | url.par ... assword | semmle.label | url.par ... assword |
 | CleartextStorage2.js:7:19:7:34 | 'password=' + pw | semmle.label | 'password=' + pw |
 | CleartextStorage2.js:7:33:7:34 | pw | semmle.label | pw |
-| CleartextStorage.js:5:7:5:40 | pw | semmle.label | pw |
+| CleartextStorage.js:5:7:5:8 | pw | semmle.label | pw |
 | CleartextStorage.js:5:12:5:40 | req.par ... sword") | semmle.label | req.par ... sword") |
 | CleartextStorage.js:6:26:6:27 | pw | semmle.label | pw |
 | tst-angularjs.js:3:32:3:45 | data1.password | semmle.label | data1.password |
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 660a49e6bb2a..f7e3f04dbb0a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-327/BrokenCryptoAlgorithm.expected
@@ -5,11 +5,11 @@
 | 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 |  |
-| tst.js:3:18:3:24 | trusted | tst.js:3:5:3:24 | secretText | provenance |  |
+| tst.js:3:5:3:14 | secretText | tst.js:11:17:11:26 | secretText | provenance |  |
+| tst.js:3:5:3:14 | secretText | tst.js:22:21:22:30 | secretText | provenance |  |
+| tst.js:3:18:3:24 | trusted | tst.js:3:5:3:14 | secretText | provenance |  |
 nodes
-| tst.js:3:5:3:24 | secretText | semmle.label | secretText |
+| tst.js:3:5:3:14 | secretText | semmle.label | secretText |
 | tst.js:3:18:3:24 | trusted | semmle.label | trusted |
 | tst.js:11:17:11:26 | secretText | semmle.label | secretText |
 | tst.js:17:17:17:25 | o.trusted | semmle.label | o.trusted |
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 fb24179ae561..cce22e3eee7a 100644
--- a/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-338/InsecureRandomness.expected
@@ -21,24 +21,24 @@
 | 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() |
+| tst.js:136:9:136:16 | password | tst.js:136:38:136:50 | Math.random() | tst.js:136:9:136:16 | 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 |  |
+| tst.js:19:9:19:14 | suffix | tst.js:20:31:20:36 | suffix | provenance |  |
 | tst.js:19:18:19:30 | Math.random() | tst.js:19:18:19:36 | Math.random() % 255 | provenance | Config |
-| tst.js:19:18:19:36 | Math.random() % 255 | tst.js:19:9:19:36 | suffix | provenance |  |
+| tst.js:19:18:19:36 | Math.random() % 255 | tst.js:19:9:19:14 | suffix | provenance |  |
 | tst.js:20:31:20:36 | suffix | tst.js:20:20:20:36 | "prefix" + suffix | provenance | Config |
-| tst.js:28:9:28:26 | pw | tst.js:29:20:29:21 | pw | provenance |  |
-| tst.js:28:14:28:26 | Math.random() | tst.js:28:9:28:26 | pw | provenance |  |
+| tst.js:28:9:28:10 | pw | tst.js:29:20:29:21 | pw | provenance |  |
+| tst.js:28:14:28:26 | Math.random() | tst.js:28:9:28:10 | pw | provenance |  |
 | tst.js:41:21:41:33 | Math.random() | tst.js:41:20:41:33 | !Math.random() | provenance | Config |
 | tst.js:61:22:61:34 | Math.random() | tst.js:61:17:61:34 | '' + Math.random() | provenance | Config |
 | tst.js:66:29:66:41 | Math.random() | tst.js:66:18:66:42 | Math.fl ... ndom()) | provenance | Config |
-| tst.js:71:9:71:48 | rand | tst.js:72:34:72:37 | rand | provenance |  |
-| tst.js:71:16:71:48 | Math.fl ... 999999) | tst.js:71:9:71:48 | rand | provenance |  |
+| tst.js:71:9:71:12 | rand | tst.js:72:34:72:37 | rand | provenance |  |
+| tst.js:71:16:71:48 | Math.fl ... 999999) | tst.js:71:9:71:12 | rand | provenance |  |
 | tst.js:71:27:71:39 | Math.random() | tst.js:71:27:71:47 | Math.ra ... 9999999 | provenance | Config |
 | tst.js:71:27:71:47 | Math.ra ... 9999999 | tst.js:71:16:71:48 | Math.fl ... 999999) | provenance | Config |
-| tst.js:72:9:72:48 | concat | tst.js:73:23:73:28 | concat | provenance |  |
-| tst.js:72:18:72:48 | ts.toSt ... tring() | tst.js:72:9:72:48 | concat | provenance |  |
+| tst.js:72:9:72:14 | concat | tst.js:73:23:73:28 | concat | provenance |  |
+| tst.js:72:18:72:48 | ts.toSt ... tring() | tst.js:72:9:72:14 | concat | provenance |  |
 | tst.js:72:34:72:37 | rand | tst.js:72:34:72:48 | rand.toString() | provenance | Config |
 | tst.js:72:34:72:48 | rand.toString() | tst.js:72:18:72:48 | ts.toSt ... tring() | provenance | Config |
 | tst.js:77:16:77:21 | secret | tst.js:77:16:77:21 | secret | provenance |  |
@@ -51,7 +51,7 @@ edges
 | tst.js:117:26:117:54 | Math.ra ... 000_000 | tst.js:117:15:117:55 | Math.fl ... 00_000) | provenance | Config |
 | tst.js:118:34:118:46 | Math.random() | tst.js:118:34:118:62 | Math.ra ... 000_000 | provenance | Config |
 | tst.js:118:34:118:62 | Math.ra ... 000_000 | tst.js:118:23:118:63 | Math.fl ... 00_000) | provenance | Config |
-| tst.js:136:21:136:67 | chars[M ... ength)] | tst.js:136:9:136:67 | password | provenance | Config |
+| tst.js:136:21:136:67 | chars[M ... ength)] | tst.js:136:9:136:16 | password | provenance | Config |
 | tst.js:136:27:136:66 | Math.fl ... length) | tst.js:136:21:136:67 | chars[M ... ength)] | provenance | Config |
 | tst.js:136:38:136:50 | Math.random() | tst.js:136:38:136:65 | Math.ra ... .length | provenance | Config |
 | tst.js:136:38:136:65 | Math.ra ... .length | tst.js:136:27:136:66 | Math.fl ... length) | provenance | Config |
@@ -60,12 +60,12 @@ nodes
 | tst.js:6:20:6:43 | "prefix ... andom() | semmle.label | "prefix ... andom() |
 | tst.js:6:31:6:43 | Math.random() | semmle.label | Math.random() |
 | tst.js:10:20:10:32 | Math.random() | semmle.label | Math.random() |
-| tst.js:19:9:19:36 | suffix | semmle.label | suffix |
+| tst.js:19:9:19:14 | suffix | semmle.label | suffix |
 | tst.js:19:18:19:30 | Math.random() | semmle.label | Math.random() |
 | tst.js:19:18:19:36 | Math.random() % 255 | semmle.label | Math.random() % 255 |
 | tst.js:20:20:20:36 | "prefix" + suffix | semmle.label | "prefix" + suffix |
 | tst.js:20:31:20:36 | suffix | semmle.label | suffix |
-| tst.js:28:9:28:26 | pw | semmle.label | pw |
+| tst.js:28:9:28:10 | pw | semmle.label | pw |
 | tst.js:28:14:28:26 | Math.random() | semmle.label | Math.random() |
 | tst.js:29:20:29:21 | pw | semmle.label | pw |
 | tst.js:41:20:41:33 | !Math.random() | semmle.label | !Math.random() |
@@ -77,11 +77,11 @@ nodes
 | tst.js:61:22:61:34 | Math.random() | semmle.label | Math.random() |
 | tst.js:66:18:66:42 | Math.fl ... ndom()) | semmle.label | Math.fl ... ndom()) |
 | tst.js:66:29:66:41 | Math.random() | semmle.label | Math.random() |
-| tst.js:71:9:71:48 | rand | semmle.label | rand |
+| tst.js:71:9:71:12 | rand | semmle.label | rand |
 | tst.js:71:16:71:48 | Math.fl ... 999999) | semmle.label | Math.fl ... 999999) |
 | tst.js:71:27:71:39 | Math.random() | semmle.label | Math.random() |
 | tst.js:71:27:71:47 | Math.ra ... 9999999 | semmle.label | Math.ra ... 9999999 |
-| tst.js:72:9:72:48 | concat | semmle.label | concat |
+| tst.js:72:9:72:14 | concat | semmle.label | concat |
 | tst.js:72:18:72:48 | ts.toSt ... tring() | semmle.label | ts.toSt ... tring() |
 | tst.js:72:34:72:37 | rand | semmle.label | rand |
 | tst.js:72:34:72:48 | rand.toString() | semmle.label | rand.toString() |
@@ -106,7 +106,7 @@ nodes
 | tst.js:118:34:118:62 | Math.ra ... 000_000 | semmle.label | Math.ra ... 000_000 |
 | tst.js:120:16:120:28 | Math.random() | semmle.label | Math.random() |
 | tst.js:121:18:121:30 | Math.random() | semmle.label | Math.random() |
-| tst.js:136:9:136:67 | password | semmle.label | password |
+| tst.js:136:9:136:16 | password | semmle.label | password |
 | tst.js:136:21:136:67 | chars[M ... ength)] | semmle.label | chars[M ... ength)] |
 | tst.js:136:27:136:66 | Math.fl ... length) | semmle.label | Math.fl ... length) |
 | tst.js:136:38:136:50 | Math.random() | semmle.label | Math.random() |
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 34b731a12d18..f879a9c865b0 100644
--- a/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-346/CorsMisconfigurationForCredentials.expected
@@ -3,11 +3,11 @@
 | 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 |  |
+| tst.js:12:9:12:14 | origin | tst.js:13:50:13:55 | origin | provenance |  |
+| tst.js:12:18:12:41 | url.par ... , true) | tst.js:12:9:12:14 | origin | provenance |  |
 | tst.js:12:28:12:34 | req.url | tst.js:12:18:12:41 | url.par ... , true) | provenance |  |
 nodes
-| tst.js:12:9:12:54 | origin | semmle.label | origin |
+| tst.js:12:9:12:14 | origin | semmle.label | origin |
 | tst.js:12:18:12:41 | url.par ... , true) | semmle.label | url.par ... , true) |
 | tst.js:12:28:12:34 | req.url | semmle.label | req.url |
 | tst.js:13:50:13:55 | origin | semmle.label | origin |
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 29e82a609567..adc9540b630c 100644
--- a/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-377/InsecureTemporaryFile.expected
@@ -5,30 +5,30 @@
 | 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 |  |
+| insecure-temporary-file.js:7:9:7:19 | 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:7:19 | tmpLocation | provenance |  |
 | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | provenance |  |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | insecure-temporary-file.js:17:32:17:38 | tmpPath | provenance |  |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | insecure-temporary-file.js:23:32:23:38 | tmpPath | provenance |  |
-| insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:15:9:15:34 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | insecure-temporary-file.js:17:32:17:38 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | insecure-temporary-file.js:23:32:23:38 | tmpPath | provenance |  |
+| insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | insecure-temporary-file.js:15:9:15:15 | tmpPath | provenance |  |
 | insecure-temporary-file.js:17:32:17:38 | tmpPath | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | provenance |  |
 | insecure-temporary-file.js:23:32:23:38 | tmpPath | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | provenance |  |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | provenance |  |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | provenance |  |
-| insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | insecure-temporary-file.js:25:11:25:92 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | insecure-temporary-file.js:28:17:28:24 | tmpPath2 | provenance |  |
+| insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | insecure-temporary-file.js:25:11:25:18 | tmpPath2 | provenance |  |
 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | provenance |  |
 nodes
-| insecure-temporary-file.js:7:9:11:5 | tmpLocation | semmle.label | tmpLocation |
+| insecure-temporary-file.js:7:9:7:19 | tmpLocation | semmle.label | tmpLocation |
 | insecure-temporary-file.js:7:23:11:5 | path.jo ... )\\n    ) | semmle.label | path.jo ... )\\n    ) |
 | insecure-temporary-file.js:8:21:8:31 | os.tmpdir() | semmle.label | os.tmpdir() |
 | insecure-temporary-file.js:13:22:13:32 | tmpLocation | semmle.label | tmpLocation |
-| insecure-temporary-file.js:15:9:15:34 | tmpPath | semmle.label | tmpPath |
+| insecure-temporary-file.js:15:9:15:15 | tmpPath | semmle.label | tmpPath |
 | insecure-temporary-file.js:15:19:15:34 | "/tmp/something" | semmle.label | "/tmp/something" |
 | insecure-temporary-file.js:17:22:17:49 | path.jo ... /foo/") | semmle.label | path.jo ... /foo/") |
 | insecure-temporary-file.js:17:32:17:38 | tmpPath | semmle.label | tmpPath |
 | insecure-temporary-file.js:23:22:23:49 | path.jo ... /foo/") | semmle.label | path.jo ... /foo/") |
 | insecure-temporary-file.js:23:32:23:38 | tmpPath | semmle.label | tmpPath |
-| insecure-temporary-file.js:25:11:25:92 | tmpPath2 | semmle.label | tmpPath2 |
+| insecure-temporary-file.js:25:11:25:18 | tmpPath2 | semmle.label | tmpPath2 |
 | insecure-temporary-file.js:25:22:25:92 | path.jo ... )}.md`) | semmle.label | path.jo ... )}.md`) |
 | insecure-temporary-file.js:25:32:25:42 | os.tmpdir() | semmle.label | os.tmpdir() |
 | insecure-temporary-file.js:26:22:26:29 | tmpPath2 | semmle.label | tmpPath2 |
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 7484e72c3f0a..d2de005f42ab 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
@@ -111,9 +111,9 @@ edges
 | lib/lib.js:35:28:35:31 | name | lib/lib.js:36:13:36:16 | name | provenance |  |
 | lib/lib.js:41:32:41:35 | name | lib/lib.js:42:17:42:20 | name | provenance |  |
 | lib/lib.js:41:32:41:35 | name | lib/lib.js:44:12:44:15 | name | provenance |  |
-| lib/lib.js:44:5:44:25 | name | lib/lib.js:45:17:45:20 | name | provenance |  |
+| lib/lib.js:44:5:44:8 | name | lib/lib.js:45:17:45:20 | name | provenance |  |
 | lib/lib.js:44:12:44:15 | name | lib/lib.js:44:12:44:25 | name.substr(1) | provenance |  |
-| lib/lib.js:44:12:44:25 | name.substr(1) | lib/lib.js:44:5:44:25 | name | provenance |  |
+| lib/lib.js:44:12:44:25 | name.substr(1) | lib/lib.js:44:5:44:8 | name | provenance |  |
 | lib/lib.js:52:22:52:25 | name | lib/lib.js:53:16:53:19 | name | provenance |  |
 | lib/moduleLib/moduleLib.js:1:28:1:31 | name | lib/moduleLib/moduleLib.js:2:13:2:16 | name | provenance |  |
 | lib/otherLib/js/src/index.js:1:28:1:31 | name | lib/otherLib/js/src/index.js:2:13:2:16 | name | provenance |  |
@@ -131,160 +131,160 @@ edges
 | lib/subLib5/subclass.js:4:10:4:13 | name | lib/subLib5/subclass.js:5:16:5:19 | name | provenance |  |
 | lib/subLib6/index.js:1:32:1:35 | name | lib/subLib6/index.js:2:14:2:17 | name | provenance |  |
 | lib/sublib/factory.js:12:26:12:29 | name | lib/sublib/factory.js:13:24:13:27 | name | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:10:2:10:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:13:2:13:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:14:2:14:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:21:6:21:12 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:26:2:26:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:27:77:27:83 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:28:76:28:82 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:31:2:31:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:32:2:32:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:34:2:34:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:41:2:41: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: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: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 |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:60:17:60:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:61:18:61:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:82:2:82:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:83:2:83:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:84:2:84:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:91:2:91:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:92:2:92:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:105:2:105:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
-| polynomial-redos.js:5:6:5:32 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
-| polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:5:6:5:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:7:2:7:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:10:2:10:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:11:2:11:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:12:2:12:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:13:2:13:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:14:2:14:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:15:2:15:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:16:2:16:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:17:23:17:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:18:2:18:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:19:2:19:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:20:2:20:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:21:6:21:12 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:25:2:25:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:26:2:26:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:27:77:27:83 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:28:76:28:82 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:30:2:30:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:31:2:31:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:32:2:32:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:33:2:33:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:34:2:34:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:36:2:36:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:37:2:37:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:38:2:38:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:40:2:40:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:41:2:41:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:43:2:43:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:44:2:44:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:46:9:46:15 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:47:2:47:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:48:2:48:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:50:14:50:20 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:51:26:51:32 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:52:22:52:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:53:21:53:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:54:22:54:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:55:23:55:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:56:22:56:28 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:57:25:57:31 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:58:21:58:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:59:23:59:29 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:60:17:60:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:61:18:61:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:62:17:62:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:63:21:63:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:64:24:64:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:65:24:65:30 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:66:19:66:25 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:67:18:67:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:71:2:71:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:73:2:73:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:75:2:75:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:77:2:77:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:80:2:80:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:81:2:81:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:82:2:82:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:83:2:83:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:84:2:84:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:86:2:86:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:88:2:88:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:89:2:89:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:90:2:90:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:91:2:91:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:92:2:92:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:94:2:94:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:95:2:95:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:96:2:96:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:98:2:98:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:100:2:100:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:101:2:101:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:102:2:102:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:103:2:103:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:104:2:104:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:105:2:105:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:107:2:107:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:108:2:108:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:109:2:109:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:111:2:111:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:112:2:112:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:114:2:114:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:116:2:116:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:118:2:118:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:127:2:127:8 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
+| polynomial-redos.js:5:6:5:12 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
+| polynomial-redos.js:5:16:5:32 | req.query.tainted | polynomial-redos.js:5:6:5:12 | tainted | provenance |  |
 | polynomial-redos.js:7:2:7:8 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
 | polynomial-redos.js:7:2:7:8 | tainted | polynomial-redos.js:8:2:8:8 | tainted | provenance |  |
 | polynomial-redos.js:8:2:8:8 | tainted | polynomial-redos.js:9:2:9:8 | tainted | provenance |  |
@@ -435,27 +435,27 @@ edges
 | 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 ... 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:7:121:14 | 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 |  |
-| polynomial-redos.js:123:3:123:20 | result | polynomial-redos.js:124:12:124:17 | result | provenance |  |
-| polynomial-redos.js:123:13:123:20 | replaced | polynomial-redos.js:123:3:123:20 | result | provenance |  |
+| polynomial-redos.js:121:18:121:55 | tainted ... /g, '') | polynomial-redos.js:121:7:121:14 | replaced | provenance |  |
+| polynomial-redos.js:123:3:123:8 | result | polynomial-redos.js:124:12:124:17 | result | provenance |  |
+| polynomial-redos.js:123:13:123:20 | replaced | polynomial-redos.js:123:3:123:8 | result | provenance |  |
 | polynomial-redos.js:127:2:127:8 | tainted | polynomial-redos.js:129:17:129:23 | tainted | provenance |  |
-| polynomial-redos.js:129:6:129:42 | modified | polynomial-redos.js:130:2:130:9 | modified | provenance |  |
+| polynomial-redos.js:129:6:129:13 | modified | polynomial-redos.js:130:2:130:9 | modified | provenance |  |
 | polynomial-redos.js:129:17:129:23 | tainted | polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | provenance |  |
 | polynomial-redos.js:129:17:129:23 | tainted | polynomial-redos.js:132:18:132:24 | tainted | provenance |  |
-| polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | polynomial-redos.js:129:6:129:42 | modified | provenance |  |
-| polynomial-redos.js:132:6:132:50 | modified2 | polynomial-redos.js:133:2:133:10 | modified2 | provenance |  |
+| polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | polynomial-redos.js:129:6:129:13 | modified | provenance |  |
+| polynomial-redos.js:132:6:132:14 | modified2 | polynomial-redos.js:133:2:133:10 | modified2 | provenance |  |
 | polynomial-redos.js:132:18:132:24 | tainted | polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | provenance |  |
 | polynomial-redos.js:132:18:132:24 | tainted | polynomial-redos.js:135:21:135:27 | tainted | provenance |  |
-| polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | polynomial-redos.js:132:6:132:50 | modified2 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 | provenance |  |
-| polynomial-redos.js:135:9:135:47 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 | provenance |  |
+| polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | polynomial-redos.js:132:6:132:14 | modified2 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:136:5:136:13 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:140:2:140:10 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:141:2:141:10 | modified3 | provenance |  |
+| polynomial-redos.js:135:9:135:17 | modified3 | polynomial-redos.js:142:2:142:10 | modified3 | provenance |  |
 | polynomial-redos.js:135:21:135:27 | tainted | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | provenance |  |
 | polynomial-redos.js:135:21:135:27 | tainted | polynomial-redos.js:138:5:138:11 | tainted | provenance |  |
-| polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | polynomial-redos.js:135:9:135:47 | modified3 | provenance |  |
+| polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | polynomial-redos.js:135:9:135:17 | modified3 | provenance |  |
 nodes
 | lib/closure.js:3:21:3:21 | x | semmle.label | x |
 | lib/closure.js:4:16:4:16 | x | semmle.label | x |
@@ -472,7 +472,7 @@ nodes
 | lib/lib.js:36:13:36:16 | name | semmle.label | name |
 | lib/lib.js:41:32:41:35 | name | semmle.label | name |
 | lib/lib.js:42:17:42:20 | name | semmle.label | name |
-| lib/lib.js:44:5:44:25 | name | semmle.label | name |
+| lib/lib.js:44:5:44:8 | name | semmle.label | name |
 | lib/lib.js:44:12:44:15 | name | semmle.label | name |
 | lib/lib.js:44:12:44:25 | name.substr(1) | semmle.label | name.substr(1) |
 | lib/lib.js:45:17:45:20 | name | semmle.label | name |
@@ -505,7 +505,7 @@ nodes
 | lib/subLib6/index.js:2:14:2:17 | name | semmle.label | name |
 | lib/sublib/factory.js:12:26:12:29 | name | semmle.label | name |
 | lib/sublib/factory.js:13:24:13:27 | name | semmle.label | name |
-| polynomial-redos.js:5:6:5:32 | tainted | semmle.label | tainted |
+| polynomial-redos.js:5:6:5:12 | tainted | semmle.label | tainted |
 | polynomial-redos.js:5:16:5:32 | req.query.tainted | semmle.label | req.query.tainted |
 | polynomial-redos.js:7:2:7:8 | tainted | semmle.label | tainted |
 | polynomial-redos.js:7:2:7:8 | tainted | semmle.label | tainted |
@@ -658,22 +658,22 @@ nodes
 | 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 ... 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:7:121:14 | 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, '') |
-| polynomial-redos.js:123:3:123:20 | result | semmle.label | result |
+| polynomial-redos.js:123:3:123:8 | result | semmle.label | result |
 | polynomial-redos.js:123:13:123:20 | replaced | semmle.label | replaced |
 | polynomial-redos.js:124:12:124:17 | result | semmle.label | result |
 | polynomial-redos.js:127:2:127:8 | tainted | semmle.label | tainted |
-| polynomial-redos.js:129:6:129:42 | modified | semmle.label | modified |
+| polynomial-redos.js:129:6:129:13 | modified | semmle.label | modified |
 | polynomial-redos.js:129:17:129:23 | tainted | semmle.label | tainted |
 | polynomial-redos.js:129:17:129:42 | tainted ... g, "b") | semmle.label | tainted ... g, "b") |
 | polynomial-redos.js:130:2:130:9 | modified | semmle.label | modified |
-| polynomial-redos.js:132:6:132:50 | modified2 | semmle.label | modified2 |
+| polynomial-redos.js:132:6:132:14 | modified2 | semmle.label | modified2 |
 | polynomial-redos.js:132:18:132:24 | tainted | semmle.label | tainted |
 | polynomial-redos.js:132:18:132:50 | tainted ... g, "e") | semmle.label | tainted ... g, "e") |
 | polynomial-redos.js:133:2:133:10 | modified2 | semmle.label | modified2 |
-| polynomial-redos.js:135:9:135:47 | modified3 | semmle.label | modified3 |
+| polynomial-redos.js:135:9:135:17 | modified3 | semmle.label | modified3 |
 | polynomial-redos.js:135:21:135:27 | tainted | semmle.label | tainted |
 | polynomial-redos.js:135:21:135:47 | tainted ... /g, "") | semmle.label | tainted ... /g, "") |
 | polynomial-redos.js:136:5:136:13 | modified3 | semmle.label | modified3 |
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 9b486b593330..036c2e563cfa 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
@@ -5,21 +5,21 @@
 | 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 |  |
-| tst.js:8:6:8:52 | prop | tst.js:14:31:14:34 | prop | provenance |  |
-| tst.js:8:6:8:52 | prop | tst.js:16:10:16:13 | prop | provenance |  |
-| tst.js:8:13:8:52 | myCoolL ... rolled) | tst.js:8:6:8:52 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:9:8:9:11 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:13:15:13:18 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:14:31:14:34 | prop | provenance |  |
+| tst.js:8:6:8:9 | prop | tst.js:16:10:16:13 | prop | provenance |  |
+| tst.js:8:13:8:52 | myCoolL ... rolled) | tst.js:8:6:8:9 | prop | provenance |  |
 | tst.js:8:28:8:51 | req.que ... trolled | tst.js:8:13:8:52 | myCoolL ... rolled) | provenance |  |
 | tst.js:8:28:8:51 | req.que ... trolled | tst.js:21:25:21:25 | x | provenance |  |
 | tst.js:21:25:21:25 | x | tst.js:22:15:22:15 | x | provenance |  |
-| tst.js:22:6:22:15 | result | tst.js:23:9:23:14 | result | provenance |  |
-| tst.js:22:15:22:15 | x | tst.js:22:6:22:15 | result | provenance |  |
+| tst.js:22:6:22:11 | result | tst.js:23:9:23:14 | result | provenance |  |
+| tst.js:22:15:22:15 | x | tst.js:22:6:22:11 | result | provenance |  |
 | tst.js:23:9:23:14 | result | tst.js:23:9:23:42 | result. ... length) | provenance |  |
-| tstNonExpr.js:5:7:5:23 | userVal | tstNonExpr.js:8:17:8:23 | userVal | provenance |  |
-| tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:5:7:5:23 | userVal | provenance |  |
+| tstNonExpr.js:5:7:5:13 | userVal | tstNonExpr.js:8:17:8:23 | userVal | provenance |  |
+| tstNonExpr.js:5:17:5:23 | req.url | tstNonExpr.js:5:7:5:13 | userVal | provenance |  |
 nodes
-| tst.js:8:6:8:52 | prop | semmle.label | prop |
+| tst.js:8:6:8:9 | prop | semmle.label | prop |
 | tst.js:8:13:8:52 | myCoolL ... rolled) | semmle.label | myCoolL ... rolled) |
 | tst.js:8:28:8:51 | req.que ... trolled | semmle.label | req.que ... trolled |
 | tst.js:9:8:9:11 | prop | semmle.label | prop |
@@ -27,11 +27,11 @@ nodes
 | tst.js:14:31:14:34 | prop | semmle.label | prop |
 | tst.js:16:10:16:13 | prop | semmle.label | prop |
 | tst.js:21:25:21:25 | x | semmle.label | x |
-| tst.js:22:6:22:15 | result | semmle.label | result |
+| tst.js:22:6:22:11 | result | semmle.label | result |
 | tst.js:22:15:22:15 | x | semmle.label | x |
 | tst.js:23:9:23:14 | result | semmle.label | result |
 | tst.js:23:9:23:42 | result. ... length) | semmle.label | result. ... length) |
-| tstNonExpr.js:5:7:5:23 | userVal | semmle.label | userVal |
+| tstNonExpr.js:5:7:5:13 | userVal | semmle.label | userVal |
 | tstNonExpr.js:5:17:5:23 | req.url | semmle.label | req.url |
 | tstNonExpr.js:8:17:8:23 | userVal | semmle.label | userVal |
 subpaths
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 85c44d009058..ffbc8cb2482e 100644
--- a/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-506/HardcodedDataInterpretedAsCode.expected
@@ -14,12 +14,12 @@ edges
 | 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:1:5:1:25 | totallyHarmlessString | tst.js:2:18:2:38 | totally ... sString | provenance |  |
+| tst.js:1:29:1:88 | '636f6e ... 6e2729' | tst.js:1:5:1:25 | 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:5:5:5:8 | test | tst.js:7:8:7:11 | test | provenance |  |
+| tst.js:5:12:5:23 | "0123456789" | tst.js:5:5:5:8 | 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 |
@@ -34,12 +34,12 @@ nodes
 | event-stream.js:6:22:6:22 | r | semmle.label | r |
 | event-stream.js:9:11:9:37 | e("2e2f ... 17461") | semmle.label | e("2e2f ... 17461") |
 | event-stream.js:9:13:9:36 | "2e2f74 ... 617461" | semmle.label | "2e2f74 ... 617461" |
-| tst.js:1:5:1:88 | totallyHarmlessString | semmle.label | totallyHarmlessString |
+| tst.js:1:5:1:25 | totallyHarmlessString | semmle.label | totallyHarmlessString |
 | tst.js:1:29:1:88 | '636f6e ... 6e2729' | semmle.label | '636f6e ... 6e2729' |
 | tst.js:2:6:2:46 | Buffer. ...  'hex') | semmle.label | Buffer. ...  'hex') |
 | tst.js:2:6:2:57 | Buffer. ... tring() | semmle.label | Buffer. ... tring() |
 | tst.js:2:18:2:38 | totally ... sString | semmle.label | totally ... sString |
-| tst.js:5:5:5:23 | test | semmle.label | test |
+| tst.js:5:5:5:8 | test | semmle.label | test |
 | 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" |
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 11c63c257e83..43fa4f8c6a82 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
@@ -74,16 +74,16 @@ edges
 | pako.js:13:14:13:22 | req.files | pako.js:13:14:13:39 | req.fil ... le.data | provenance |  |
 | pako.js:13:14:13:39 | req.fil ... le.data | pako.js:28:19:28:25 | zipFile | provenance |  |
 | pako.js:17:19:17:25 | zipFile | pako.js:18:48:18:54 | zipFile | provenance |  |
-| pako.js:18:11:18:68 | myArray | pako.js:21:31:21:37 | myArray | provenance |  |
-| pako.js:18:21:18:68 | Buffer. ... uffer)) | pako.js:18:11:18:68 | myArray | provenance |  |
+| pako.js:18:11:18:17 | myArray | pako.js:21:31:21:37 | myArray | provenance |  |
+| pako.js:18:21:18:68 | Buffer. ... uffer)) | pako.js:18:11:18:17 | myArray | provenance |  |
 | pako.js:18:33:18:67 | new Uin ... buffer) | pako.js:18:21:18:68 | Buffer. ... uffer)) | provenance |  |
 | pako.js:18:48:18:54 | zipFile | pako.js:18:48:18:66 | zipFile.data.buffer | provenance |  |
 | pako.js:18:48:18:66 | zipFile.data.buffer | pako.js:18:33:18:67 | new Uin ... buffer) | provenance | Config |
 | pako.js:28:19:28:25 | zipFile | pako.js:29:36:29:42 | zipFile | provenance |  |
-| pako.js:29:11:29:62 | myArray | pako.js:32:31:32:37 | myArray | provenance |  |
-| pako.js:29:11:29:62 | myArray [ArrayElement] | pako.js:32:31:32:37 | myArray | provenance |  |
-| pako.js:29:21:29:55 | new Uin ... buffer) | pako.js:29:11:29:62 | myArray | provenance |  |
-| pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | pako.js:29:11:29:62 | myArray [ArrayElement] | provenance |  |
+| pako.js:29:11:29:17 | myArray | pako.js:32:31:32:37 | myArray | provenance |  |
+| pako.js:29:11:29:17 | myArray [ArrayElement] | pako.js:32:31:32:37 | myArray | provenance |  |
+| pako.js:29:21:29:55 | new Uin ... buffer) | pako.js:29:11:29:17 | myArray | provenance |  |
+| pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | pako.js:29:11:29:17 | myArray [ArrayElement] | provenance |  |
 | pako.js:29:36:29:42 | zipFile | pako.js:29:36:29:54 | zipFile.data.buffer | provenance |  |
 | pako.js:29:36:29:54 | zipFile.data.buffer | pako.js:29:21:29:55 | new Uin ... buffer) | provenance | Config |
 | pako.js:29:36:29:54 | zipFile.data.buffer | pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | provenance |  |
@@ -132,8 +132,8 @@ edges
 | zlib.js:75:39:75:45 | zipFile | zlib.js:75:39:75:50 | zipFile.data | provenance |  |
 | zlib.js:75:39:75:50 | zipFile.data | zlib.js:75:25:75:51 | Readabl ... e.data) | provenance | Config |
 | zlib.js:82:43:82:49 | zipFile | zlib.js:83:39:83:45 | zipFile | provenance |  |
-| zlib.js:83:11:83:51 | inputStream | zlib.js:86:9:86:19 | inputStream | provenance |  |
-| zlib.js:83:25:83:51 | Readabl ... e.data) | zlib.js:83:11:83:51 | inputStream | provenance |  |
+| zlib.js:83:11:83:21 | inputStream | zlib.js:86:9:86:19 | inputStream | provenance |  |
+| zlib.js:83:25:83:51 | Readabl ... e.data) | zlib.js:83:11:83:21 | inputStream | provenance |  |
 | zlib.js:83:39:83:45 | zipFile | zlib.js:83:39:83:50 | zipFile.data | provenance |  |
 | zlib.js:83:39:83:50 | zipFile.data | zlib.js:83:25:83:51 | Readabl ... e.data) | provenance | Config |
 | zlib.js:86:9:86:19 | inputStream | zlib.js:87:9:87:27 | zlib.createGunzip() | provenance | Config |
@@ -178,15 +178,15 @@ nodes
 | pako.js:13:14:13:22 | req.files | semmle.label | req.files |
 | pako.js:13:14:13:39 | req.fil ... le.data | semmle.label | req.fil ... le.data |
 | pako.js:17:19:17:25 | zipFile | semmle.label | zipFile |
-| pako.js:18:11:18:68 | myArray | semmle.label | myArray |
+| pako.js:18:11:18:17 | myArray | semmle.label | myArray |
 | pako.js:18:21:18:68 | Buffer. ... uffer)) | semmle.label | Buffer. ... uffer)) |
 | pako.js:18:33:18:67 | new Uin ... buffer) | semmle.label | new Uin ... buffer) |
 | pako.js:18:48:18:54 | zipFile | semmle.label | zipFile |
 | pako.js:18:48:18:66 | zipFile.data.buffer | semmle.label | zipFile.data.buffer |
 | pako.js:21:31:21:37 | myArray | semmle.label | myArray |
 | pako.js:28:19:28:25 | zipFile | semmle.label | zipFile |
-| pako.js:29:11:29:62 | myArray | semmle.label | myArray |
-| pako.js:29:11:29:62 | myArray [ArrayElement] | semmle.label | myArray [ArrayElement] |
+| pako.js:29:11:29:17 | myArray | semmle.label | myArray |
+| pako.js:29:11:29:17 | myArray [ArrayElement] | semmle.label | myArray [ArrayElement] |
 | pako.js:29:21:29:55 | new Uin ... buffer) | semmle.label | new Uin ... buffer) |
 | pako.js:29:21:29:55 | new Uin ... buffer) [ArrayElement] | semmle.label | new Uin ... buffer) [ArrayElement] |
 | pako.js:29:36:29:42 | zipFile | semmle.label | zipFile |
@@ -246,7 +246,7 @@ nodes
 | zlib.js:78:22:78:39 | zlib.createUnzip() | semmle.label | zlib.createUnzip() |
 | zlib.js:79:22:79:50 | zlib.cr ... press() | semmle.label | zlib.cr ... press() |
 | zlib.js:82:43:82:49 | zipFile | semmle.label | zipFile |
-| zlib.js:83:11:83:51 | inputStream | semmle.label | inputStream |
+| zlib.js:83:11:83:21 | inputStream | semmle.label | inputStream |
 | zlib.js:83:25:83:51 | Readabl ... e.data) | semmle.label | Readabl ... e.data) |
 | zlib.js:83:39:83:45 | zipFile | semmle.label | zipFile |
 | zlib.js:83:39:83:50 | zipFile.data | semmle.label | zipFile.data |
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 243d4b25dfdc..d4617441802c 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
@@ -79,41 +79,41 @@ edges
 | 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:11:4:20 | [, group1] | regexp-exec.js:4:14:4:19 | group1 | provenance |  |
+| regexp-exec.js:4:14:4:19 | 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:11:9:20 | [, group1] | regexp-exec.js:9:14:9:19 | group1 | provenance |  |
+| regexp-exec.js:9:14:9:19 | 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:11:29:20 | [, group1] | regexp-exec.js:29:14:29:19 | group1 | provenance |  |
+| regexp-exec.js:29:14:29:19 | 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:11:34:20 | [, group1] | regexp-exec.js:34:14:34:19 | group1 | provenance |  |
+| regexp-exec.js:34:14:34:19 | 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:11:39:20 | [, group1] | regexp-exec.js:39:14:39:19 | group1 | provenance |  |
+| regexp-exec.js:39:14:39:19 | 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 |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:4:27:4:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:16:27:16:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:19:27:19:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:22:27:22:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:25:27:25:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:28:27:28:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:31:27:31:29 | url | provenance |  |
+| sanitizer.js:2:9:2:11 | url | sanitizer.js:37:27:37:29 | url | provenance |  |
+| sanitizer.js:2:15:2:25 | window.name | sanitizer.js:2:9:2:11 | url | provenance |  |
+| tst2.js:2:7:2:10 | href | tst2.js:3:21:3:24 | href | provenance |  |
+| tst2.js:2:14:2:33 | window.location.href | tst2.js:2:7:2:10 | 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:2:7:2:14 | redirect | tst6.js:3:21:3:28 | redirect | provenance |  |
+| tst6.js:2:7:2:14 | redirect | tst6.js:4:17:4:24 | redirect | provenance |  |
+| tst6.js:2:18:2:45 | $locati ... irect') | tst6.js:2:7:2:14 | 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 |
@@ -126,63 +126,63 @@ edges
 | 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:9:2:15 | payload | tst13.js:4:15:4:21 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:8:21:8:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:12:14:12:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:16:17:16:23 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:20:14:20:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:24:14:24:20 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:28:21:28:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:32:17:32:23 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:36:21:36:27 | payload | provenance |  |
+| tst13.js:2:9:2:15 | payload | tst13.js:40:15:40:21 | payload | provenance |  |
+| tst13.js:2:9:2:15 | 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:2:19:2:52 | documen ... bstr(1) | tst13.js:2:9:2:15 | 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:9:59:15 | 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:59:19:59:52 | documen ... bstr(1) | tst13.js:59:9:59:15 | payload | provenance |  |
+| tst13.js:65:9:65:15 | 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:65:19:65:49 | history ... bstr(1) | tst13.js:65:9:65:15 | payload | provenance |  |
+| tst13.js:72:9:72:15 | 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:72:19:72:49 | history ... bstr(1) | tst13.js:72:9:72:15 | payload | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:80:21:80:23 | url | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:81:28:81:30 | url | provenance |  |
+| tst13.js:78:9:78:11 | url | tst13.js:82:27:82:29 | url | provenance |  |
+| tst13.js:78:9:78:11 | 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 |  |
+| tst13.js:78:15:78:48 | documen ... bstr(1) | tst13.js:78:9:78:11 | url | provenance |  |
+| tst15.js:2:9:2:11 | url | tst15.js:3:23:3:25 | url | provenance |  |
+| tst15.js:2:9:2:11 | url | tst15.js:4:23:4:25 | url | provenance |  |
+| tst15.js:2:9:2:11 | 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:2:15:2:42 | documen ... tring() | tst15.js:2:9:2:11 | 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:9:7:12 | url2 | tst15.js:8:23:8:26 | url2 | provenance |  |
+| tst15.js:7:9:7:12 | url2 | tst15.js:9:23:9:26 | url2 | provenance |  |
+| tst15.js:7:9:7:12 | 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:7:16:7:43 | documen ... tring() | tst15.js:7:9:7:12 | 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:9:12:14 | search | tst15.js:13:23:13:28 | search | provenance |  |
+| tst15.js:12:9:12:14 | search | tst15.js:14:23:14:28 | search | provenance |  |
+| tst15.js:12:9:12:14 | 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:12:18:12:52 | documen ... tring() | tst15.js:12:9:12:14 | 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 |  |
@@ -208,9 +208,9 @@ edges
 | 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:13:4:18 | 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:4:22:4:49 | locatio ... ring(1) | typed.ts:4:13:4:18 | 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 |
@@ -236,31 +236,31 @@ nodes
 | react.js:43:19:43:40 | documen ... on.hash | semmle.label | documen ... on.hash |
 | react.js:43:19:43:50 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | regexp-exec.js:4:11:4:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:4:11:4:57 | group1 | semmle.label | group1 |
+| regexp-exec.js:4:14:4:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:4:24:4:57 | /#(.*)/ ... n.href) | semmle.label | /#(.*)/ ... n.href) |
 | regexp-exec.js:4:37:4:56 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:5:28:5:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:9:11:9:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:9:11:9:58 | group1 | semmle.label | group1 |
+| regexp-exec.js:9:14:9:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:9:24:9:58 | /\\?(.*) ... n.href) | semmle.label | /\\?(.*) ... n.href) |
 | regexp-exec.js:9:38:9:57 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:10:28:10:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:29:11:29:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:29:11:29:58 | group1 | semmle.label | group1 |
+| regexp-exec.js:29:14:29:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:29:24:29:43 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:29:24:29:58 | window. ... #(.*)/) | semmle.label | window. ... #(.*)/) |
 | regexp-exec.js:30:28:30:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:34:11:34:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:34:11:34:64 | group1 | semmle.label | group1 |
+| regexp-exec.js:34:14:34:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:34:24:34:43 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:34:24:34:61 | window. ... #(.*)/) | semmle.label | window. ... #(.*)/) |
 | regexp-exec.js:35:28:35:33 | group1 | semmle.label | group1 |
 | regexp-exec.js:39:11:39:20 | [, group1] | semmle.label | [, group1] |
-| regexp-exec.js:39:11:39:71 | group1 | semmle.label | group1 |
+| regexp-exec.js:39:14:39:19 | group1 | semmle.label | group1 |
 | regexp-exec.js:39:24:39:71 | new Reg ... n.href) | semmle.label | new Reg ... n.href) |
 | regexp-exec.js:39:51:39:70 | window.location.href | semmle.label | window.location.href |
 | regexp-exec.js:40:28:40:33 | group1 | semmle.label | group1 |
-| sanitizer.js:2:9:2:25 | url | semmle.label | url |
+| sanitizer.js:2:9:2:11 | url | semmle.label | url |
 | sanitizer.js:2:15:2:25 | window.name | semmle.label | window.name |
 | sanitizer.js:4:27:4:29 | url | semmle.label | url |
 | sanitizer.js:16:27:16:29 | url | semmle.label | url |
@@ -270,11 +270,11 @@ nodes
 | sanitizer.js:28:27:28:29 | url | semmle.label | url |
 | sanitizer.js:31:27:31:29 | url | semmle.label | url |
 | sanitizer.js:37:27:37:29 | url | semmle.label | url |
-| tst2.js:2:7:2:33 | href | semmle.label | href |
+| tst2.js:2:7:2:10 | href | semmle.label | href |
 | tst2.js:2:14:2:33 | window.location.href | semmle.label | window.location.href |
 | 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:7:2:14 | redirect | semmle.label | redirect |
 | tst6.js:2:18:2:45 | $locati ... irect') | semmle.label | $locati ... irect') |
 | tst6.js:3:21:3:28 | redirect | semmle.label | redirect |
 | tst6.js:4:17:4:24 | redirect | semmle.label | redirect |
@@ -298,7 +298,7 @@ nodes
 | 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:9:2:15 | 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) |
 | tst13.js:4:15:4:21 | payload | semmle.label | payload |
@@ -316,26 +316,26 @@ nodes
 | tst13.js:50:23:50:23 | e | semmle.label | e |
 | tst13.js:52:34:52:34 | e | semmle.label | e |
 | tst13.js:53:28:53:28 | e | semmle.label | e |
-| tst13.js:59:9:59:52 | payload | semmle.label | payload |
+| tst13.js:59:9:59:15 | payload | semmle.label | payload |
 | tst13.js:59:19:59:42 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:59:19:59:52 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst13.js:61:18:61:24 | payload | semmle.label | payload |
-| tst13.js:65:9:65:49 | payload | semmle.label | payload |
+| tst13.js:65:9:65:15 | payload | semmle.label | payload |
 | tst13.js:65:19:65:39 | history ... on.hash | semmle.label | history ... on.hash |
 | tst13.js:65:19:65:49 | history ... bstr(1) | semmle.label | history ... bstr(1) |
 | tst13.js:67:21:67:27 | payload | semmle.label | payload |
-| tst13.js:72:9:72:49 | payload | semmle.label | payload |
+| tst13.js:72:9:72:15 | payload | semmle.label | payload |
 | tst13.js:72:19:72:39 | history ... on.hash | semmle.label | history ... on.hash |
 | tst13.js:72:19:72:49 | history ... bstr(1) | semmle.label | history ... bstr(1) |
 | tst13.js:74:21:74:27 | payload | semmle.label | payload |
-| tst13.js:78:9:78:48 | url | semmle.label | url |
+| tst13.js:78:9:78:11 | url | semmle.label | url |
 | tst13.js:78:15:78:38 | documen ... .search | semmle.label | documen ... .search |
 | tst13.js:78:15:78:48 | documen ... bstr(1) | semmle.label | documen ... bstr(1) |
 | tst13.js:80:21:80:23 | url | semmle.label | url |
 | tst13.js:81:28:81:30 | url | semmle.label | url |
 | tst13.js:82:27:82:29 | url | semmle.label | url |
 | tst13.js:83:22:83:24 | url | semmle.label | url |
-| tst15.js:2:9:2:42 | url | semmle.label | url |
+| tst15.js:2:9:2:11 | url | semmle.label | url |
 | tst15.js:2:15:2:31 | document.location | semmle.label | document.location |
 | tst15.js:2:15:2:42 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:3:23:3:25 | url | semmle.label | url |
@@ -347,7 +347,7 @@ nodes
 | tst15.js:5:23:5:25 | url | semmle.label | url |
 | tst15.js:5:23:5:60 | url.sub ... ', 10)) | semmle.label | url.sub ... ', 10)) |
 | tst15.js:5:23:5:73 | url.sub ... ring(1) | semmle.label | url.sub ... ring(1) |
-| tst15.js:7:9:7:43 | url2 | semmle.label | url2 |
+| tst15.js:7:9:7:12 | url2 | semmle.label | url2 |
 | tst15.js:7:16:7:32 | document.location | semmle.label | document.location |
 | tst15.js:7:16:7:43 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:8:23:8:26 | url2 | semmle.label | url2 |
@@ -359,7 +359,7 @@ nodes
 | tst15.js:10:23:10:26 | url2 | semmle.label | url2 |
 | tst15.js:10:23:10:62 | url2.su ... ', 10)) | semmle.label | url2.su ... ', 10)) |
 | tst15.js:10:23:10:83 | url2.su ... nown()) | semmle.label | url2.su ... nown()) |
-| tst15.js:12:9:12:52 | search | semmle.label | search |
+| tst15.js:12:9:12:14 | search | semmle.label | search |
 | tst15.js:12:18:12:41 | documen ... .search | semmle.label | documen ... .search |
 | tst15.js:12:18:12:52 | documen ... tring() | semmle.label | documen ... tring() |
 | tst15.js:13:23:13:28 | search | semmle.label | search |
@@ -400,7 +400,7 @@ nodes
 | 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:13:4:18 | 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) |
 | typed.ts:5:25:5:30 | params | semmle.label | params |
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 34c12408de30..c8466a9560db 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
@@ -30,16 +30,16 @@
 | 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: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 |  |
+| ServerSideUrlRedirectGood2.js:16:7:16:12 | target | ServerSideUrlRedirectGood2.js:18:18:18:23 | target | provenance |  |
+| ServerSideUrlRedirectGood2.js:16:16:16:34 | req.query["target"] | ServerSideUrlRedirectGood2.js:16:7:16:12 | target | provenance |  |
+| express.js:25:7:25:12 | target | express.js:30:18:30:23 | target | provenance |  |
+| express.js:25:7:25:12 | target | express.js:31:16:31:21 | target | provenance |  |
+| express.js:25:16:25:34 | req.param("target") | express.js:25:7:25:12 | 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:77:7:77:12 | target | express.js:83:18:83:23 | target | provenance |  |
+| express.js:77:7:77:12 | target | express.js:89:16:89:21 | target | provenance |  |
+| express.js:77:16:77:34 | req.param("target") | express.js:77:7:77:12 | 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 |  |
@@ -50,45 +50,45 @@ edges
 | 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:140:7:140:12 | target | express.js:145:18:145:23 | target | provenance |  |
+| express.js:140:7:140:12 | target | express.js:150:18:150:23 | target | provenance |  |
+| express.js:140:16:140:34 | req.param("target") | express.js:140:7:140:12 | target | provenance |  |
+| express.js:154:7:154:13 | myThing | express.js:155:16:155:22 | myThing | provenance |  |
+| express.js:154:7:154:13 | 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:17:154:54 | JSON.st ... (1, -1) | express.js:154:7:154:13 | myThing | provenance |  |
+| express.js:154:17:154:54 | JSON.st ... (1, -1) [ArrayElement] | express.js:154:7:154:13 | 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 |  |
-| koa.js:6:6:6:27 | url | koa.js:20:16:20:18 | url | provenance |  |
-| koa.js:6:12:6:27 | ctx.query.target | koa.js:6:6:6:27 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:7:15:7:17 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:8:18:8:20 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:14:16:14:18 | url | provenance |  |
+| koa.js:6:6:6:8 | url | koa.js:20:16:20:18 | url | provenance |  |
+| koa.js:6:12:6:27 | ctx.query.target | koa.js:6:6:6:8 | url | provenance |  |
 | koa.js:8:18:8:20 | url | koa.js:8:15:8:26 | `${url}${x}` | provenance |  |
 | next.ts:11:31:11:38 | req.body | next.ts:11:31:11:50 | req.body.callbackUrl | provenance |  |
-| 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:7:5:12 | target | node.js:6:34:6:39 | target | provenance |  |
+| node.js:5:16:5:39 | url.par ... , true) | node.js:5:7:5:12 | 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: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:7:10:12 | target | node.js:13:40:13:45 | target | provenance |  |
+| node.js:10:16:10:39 | url.par ... , true) | node.js:10:7:10:12 | target | provenance |  |
 | node.js:10:26:10:32 | req.url | node.js:10:16:10:39 | url.par ... , true) | 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:7:27:12 | target | node.js:29:34:29:39 | target | provenance |  |
+| node.js:27:16:27:39 | url.par ... , true) | node.js:27:7:27:12 | 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 |  |
+| react-native.js:7:7:7:13 | tainted | react-native.js:8:17:8:23 | tainted | provenance |  |
+| react-native.js:7:7:7:13 | 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:13 | tainted | provenance |  |
 nodes
 | 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:7:16:12 | 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: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:7:25:12 | 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:31:16:31:21 | target | semmle.label | target |
@@ -96,7 +96,7 @@ nodes
 | 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:7:77:12 | 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 |
@@ -115,18 +115,18 @@ nodes
 | 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:7:140:12 | 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:7:154:13 | myThing | semmle.label | myThing |
+| express.js:154:7:154:13 | 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:6:6:8 | 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 |
 | koa.js:8:15:8:26 | `${url}${x}` | semmle.label | `${url}${x}` |
@@ -135,21 +135,21 @@ nodes
 | koa.js:20:16:20:18 | url | semmle.label | url |
 | next.ts:11:31:11:38 | req.body | semmle.label | req.body |
 | next.ts:11:31:11:50 | req.body.callbackUrl | semmle.label | req.body.callbackUrl |
-| node.js:5:7:5:52 | target | semmle.label | target |
+| node.js:5:7:5:12 | target | semmle.label | target |
 | node.js:5:16:5:39 | url.par ... , true) | semmle.label | url.par ... , true) |
 | node.js:5:26:5:32 | req.url | semmle.label | req.url |
 | node.js:6:34:6:39 | target | semmle.label | target |
-| node.js:10:7:10:52 | target | semmle.label | target |
+| node.js:10:7:10:12 | 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: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:7:27:12 | 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:7:7:13 | 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 |
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 4b946c920428..07b6acfc3612 100644
--- a/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-611/Xxe.expected
@@ -8,12 +8,12 @@
 | 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: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 |  |
+| domparser.js:2:7:2:9 | src | domparser.js:10:55:10:57 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:12:57:12:59 | src | provenance |  |
+| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:9 | src | 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:7:2:9 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | domparser.js:10:55:10:57 | src | semmle.label | src |
 | domparser.js:12:57:12:59 | src | semmle.label | src |
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 4ad42bcdc03e..e1db31c6f7ba 100644
--- a/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-643/XpathInjection.expected
@@ -7,19 +7,19 @@
 | 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: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:6:7:6:14 | userName | XpathInjectionBad.js:8:66:8:73 | userName | provenance |  |
+| XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | XpathInjectionBad.js:6:7:6:14 | userName | 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 |  |
-| tst.js:6:7:6:37 | tainted | tst.js:7:15:7:21 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:8:16:8:22 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:9:17:9:23 | tainted | provenance |  |
-| tst.js:6:7:6:37 | tainted | tst.js:11:8:11:14 | tainted | provenance |  |
-| tst.js:6:17:6:37 | req.par ... rName") | tst.js:6:7:6:37 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:7:15:7:21 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:8:16:8:22 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:9:17:9:23 | tainted | provenance |  |
+| tst.js:6:7:6:13 | tainted | tst.js:11:8:11:14 | tainted | provenance |  |
+| tst.js:6:17:6:37 | req.par ... rName") | tst.js:6:7:6:13 | tainted | provenance |  |
 nodes
-| XpathInjectionBad.js:6:7:6:38 | userName | semmle.label | userName |
+| XpathInjectionBad.js:6:7:6:14 | userName | semmle.label | userName |
 | XpathInjectionBad.js:6:18:6:38 | req.par ... rName") | semmle.label | req.par ... rName") |
 | XpathInjectionBad.js:8:34:8:96 | "//user ... text()" | semmle.label | "//user ... text()" |
 | XpathInjectionBad.js:8:66:8:73 | userName | semmle.label | userName |
@@ -27,7 +27,7 @@ nodes
 | tst2.js:1:13:1:47 | documen ... ring(1) | semmle.label | documen ... ring(1) |
 | tst2.js:2:27:2:31 | query | semmle.label | query |
 | tst2.js:3:19:3:23 | query | semmle.label | query |
-| tst.js:6:7:6:37 | tainted | semmle.label | tainted |
+| tst.js:6:7:6:13 | tainted | semmle.label | tainted |
 | tst.js:6:17:6:37 | req.par ... rName") | semmle.label | req.par ... rName") |
 | tst.js:7:15:7:21 | tainted | semmle.label | tainted |
 | tst.js:8:16:8:22 | tainted | semmle.label | tainted |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
index 07225ec763e3..bdc3775dbb78 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-disabled/RegExpInjection.expected
@@ -18,19 +18,19 @@
 | 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: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: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:5:7:5:9 | key | RegExpInjection.js:7:31:7:33 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:17:19:17:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:18:19:18:21 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:28:12:28:14 | key | provenance |  |
+| RegExpInjection.js:5:7:5:9 | key | RegExpInjection.js:49:14:49:16 | key | provenance |  |
+| RegExpInjection.js:5:13:5:28 | req.param("key") | RegExpInjection.js:5:7:5:9 | key | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:35:23:35:27 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:36:26:36:30 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:37:25:37:29 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:40:24:40:28 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:41:27:41:31 | input | provenance |  |
+| RegExpInjection.js:5:31:5:35 | input | RegExpInjection.js:42:26:42:30 | input | provenance |  |
+| RegExpInjection.js:5:39:5:56 | req.param("input") | RegExpInjection.js:5:31:5:35 | input | 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 |  |
@@ -50,25 +50,25 @@ edges
 | 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:55:31:55:35 | input | RegExpInjection.js:59:14:59:18 | input | provenance |  |
+| RegExpInjection.js:55:39:55:56 | req.param("input") | RegExpInjection.js:55:31:55:35 | input | provenance |  |
+| RegExpInjection.js:77:7:77:11 | input | RegExpInjection.js:82:25:82:29 | input | provenance |  |
+| RegExpInjection.js:77:15:77:32 | req.param("input") | RegExpInjection.js:77:7:77:11 | 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: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:92:7:92:11 | input | RegExpInjection.js:94:19:94:23 | input | provenance |  |
+| RegExpInjection.js:92:15:92:32 | req.param("input") | RegExpInjection.js:92:7:92:11 | input | provenance |  |
+| RegExpInjection.js:94:7:94:15 | 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 |  |
+| RegExpInjection.js:94:19:94:106 | input.r ... "\\\\$&") | RegExpInjection.js:94:7:94:15 | sanitized | provenance |  |
+| tst.js:5:9:5:12 | data | tst.js:6:21:6:24 | data | provenance |  |
+| tst.js:5:16:5:29 | req.query.data | tst.js:5:9:5:12 | data | provenance |  |
 | tst.js:6:21:6:24 | data | tst.js:6:16:6:35 | "^"+ data.name + "$" | provenance |  |
 nodes
-| RegExpInjection.js:5:7:5:28 | key | semmle.label | key |
+| RegExpInjection.js:5:7:5:9 | key | semmle.label | key |
 | 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:31:5:35 | input | semmle.label | input |
 | RegExpInjection.js:5:39:5:56 | req.param("input") | semmle.label | req.param("input") |
 | RegExpInjection.js:7:23:7:45 | "\\\\b" + ... (.*)\\n" | semmle.label | "\\\\b" + ... (.*)\\n" |
 | RegExpInjection.js:7:31:7:33 | key | semmle.label | key |
@@ -99,23 +99,23 @@ nodes
 | 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:31:55:35 | 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:7:77:11 | 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: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:7:92:11 | 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:7:94:15 | 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:9:5:12 | 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 |
diff --git a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected
index 95c1c0df9eb8..ad2123f3d14d 100644
--- a/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-730/Threat-models-enabled/RegExpInjection.expected
@@ -8,27 +8,27 @@
 edges
 | RegExpInjection.js:6:18:6:28 | process.env | RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | provenance |  |
 | RegExpInjection.js:8:18:8:28 | process.env | RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | provenance |  |
-| RegExpInjection.js:10:7:10:35 | envVar | RegExpInjection.js:11:14:11:19 | envVar | provenance |  |
-| RegExpInjection.js:10:16:10:26 | process.env | RegExpInjection.js:10:7:10:35 | envVar | provenance |  |
+| RegExpInjection.js:10:7:10:12 | envVar | RegExpInjection.js:11:14:11:19 | envVar | provenance |  |
+| RegExpInjection.js:10:16:10:26 | process.env | RegExpInjection.js:10:7:10:12 | envVar | provenance |  |
 | RegExpInjection.js:14:18:14:29 | process.argv | RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | provenance |  |
-| RegExpInjection.js:16:7:16:28 | argv | RegExpInjection.js:17:14:17:17 | argv | provenance |  |
-| RegExpInjection.js:16:14:16:25 | process.argv | RegExpInjection.js:16:7:16:28 | argv | provenance |  |
-| RegExpInjection.js:20:7:20:36 | userInput | RegExpInjection.js:21:14:21:22 | userInput | provenance |  |
-| RegExpInjection.js:20:19:20:36 | req.param("input") | RegExpInjection.js:20:7:20:36 | userInput | provenance |  |
+| RegExpInjection.js:16:7:16:10 | argv | RegExpInjection.js:17:14:17:17 | argv | provenance |  |
+| RegExpInjection.js:16:14:16:25 | process.argv | RegExpInjection.js:16:7:16:10 | argv | provenance |  |
+| RegExpInjection.js:20:7:20:15 | userInput | RegExpInjection.js:21:14:21:22 | userInput | provenance |  |
+| RegExpInjection.js:20:19:20:36 | req.param("input") | RegExpInjection.js:20:7:20:15 | userInput | provenance |  |
 nodes
 | RegExpInjection.js:6:14:6:48 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
 | RegExpInjection.js:6:18:6:28 | process.env | semmle.label | process.env |
 | RegExpInjection.js:8:14:8:40 | `^${pro ... }/bin$` | semmle.label | `^${pro ... }/bin$` |
 | RegExpInjection.js:8:18:8:28 | process.env | semmle.label | process.env |
-| RegExpInjection.js:10:7:10:35 | envVar | semmle.label | envVar |
+| RegExpInjection.js:10:7:10:12 | envVar | semmle.label | envVar |
 | RegExpInjection.js:10:16:10:26 | process.env | semmle.label | process.env |
 | RegExpInjection.js:11:14:11:19 | envVar | semmle.label | envVar |
 | RegExpInjection.js:14:14:14:47 | `^${pro ... r.app$` | semmle.label | `^${pro ... r.app$` |
 | RegExpInjection.js:14:18:14:29 | process.argv | semmle.label | process.argv |
-| RegExpInjection.js:16:7:16:28 | argv | semmle.label | argv |
+| RegExpInjection.js:16:7:16:10 | argv | semmle.label | argv |
 | RegExpInjection.js:16:14:16:25 | process.argv | semmle.label | process.argv |
 | RegExpInjection.js:17:14:17:17 | argv | semmle.label | argv |
-| RegExpInjection.js:20:7:20:36 | userInput | semmle.label | userInput |
+| RegExpInjection.js:20:7:20:15 | userInput | semmle.label | userInput |
 | RegExpInjection.js:20:19:20:36 | req.param("input") | semmle.label | req.param("input") |
 | RegExpInjection.js:21:14:21:22 | userInput | semmle.label | userInput |
 subpaths
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 74cb64bdb8d7..11aaf95922c7 100644
--- a/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-754/UnvalidatedDynamicMethodCall.expected
@@ -16,82 +16,82 @@
 | 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:9:6:15 | message | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | provenance |  |
+| UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | UnsafeDynamicMethodAccess.js:6:9:6:15 | 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:9:13:14 | action | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | provenance |  |
+| UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | UnvalidatedDynamicMethodCall2.js:13:9:13:14 | 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:7:14:12 | action | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | provenance |  |
+| UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | UnvalidatedDynamicMethodCall.js:14:7:14:12 | 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:13:14:18 | action | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | provenance |  |
+| UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | UnvalidatedDynamicMethodCallGood4.js:14:13:14:18 | 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:9:7:12 | name | tst.js:11:9:11:12 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:17:18:17:21 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:21:11:21:14 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:26:11:26:14 | name | provenance |  |
+| tst.js:7:9:7:12 | name | tst.js:28:11:28:14 | name | provenance |  |
+| tst.js:7:9:7:12 | 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:16:7:39 | JSON.pa ... a).name | tst.js:7:9:7:12 | 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:9:17:10 | fn | tst.js:18:5:18:6 | fn | provenance |  |
+| tst.js:17:9:17:10 | fn | tst.js:20:7:20:8 | fn | provenance |  |
+| tst.js:17:9:17:10 | fn | tst.js:22:11:22:12 | fn | provenance |  |
+| tst.js:17:14:17:22 | obj[name] | tst.js:17:9:17:10 | 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:9:34:11 | key | tst.js:35:9:35:11 | key | provenance |  |
+| tst.js:34:9:34:11 | key | tst.js:37:11:37:13 | key | provenance |  |
+| tst.js:34:15:34:24 | "$" + name | tst.js:34:9:34:11 | 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:9:48:12 | 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:16:48:39 | JSON.pa ... a).name | tst.js:48:9:48:12 | 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:9:49:10 | fn | tst.js:50:5:50:6 | fn | provenance |  |
+| tst.js:49:14:49:23 | obj2[name] | tst.js:49:9:49:10 | 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 |
+| UnsafeDynamicMethodAccess.js:6:9:6:15 | message | semmle.label | message |
 | UnsafeDynamicMethodAccess.js:6:19:6:37 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | UnsafeDynamicMethodAccess.js:6:30:6:31 | ev | semmle.label | ev |
 | UnsafeDynamicMethodAccess.js:6:30:6:36 | ev.data | semmle.label | ev.data |
 | UnsafeDynamicMethodAccess.js:15:5:15:21 | obj[message.name] | semmle.label | obj[message.name] |
 | UnsafeDynamicMethodAccess.js:15:9:15:15 | message | semmle.label | message |
 | UnsafeDynamicMethodAccess.js:15:9:15:20 | message.name | semmle.label | message.name |
-| UnvalidatedDynamicMethodCall2.js:13:9:13:47 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCall2.js:13:9:13:14 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCall2.js:13:18:13:47 | actions ... action) | semmle.label | actions ... action) |
 | UnvalidatedDynamicMethodCall2.js:13:30:13:46 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCall2.js:14:13:14:18 | action | semmle.label | action |
-| UnvalidatedDynamicMethodCall.js:14:7:14:41 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCall.js:14:7:14:12 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCall.js:14:16:14:41 | actions ... action] | semmle.label | actions ... action] |
 | UnvalidatedDynamicMethodCall.js:14:24:14:40 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCall.js:15:11:15:16 | action | semmle.label | action |
-| UnvalidatedDynamicMethodCallGood4.js:14:13:14:51 | action | semmle.label | action |
+| UnvalidatedDynamicMethodCallGood4.js:14:13:14:18 | action | semmle.label | action |
 | UnvalidatedDynamicMethodCallGood4.js:14:22:14:51 | actions ... action) | semmle.label | actions ... action) |
 | UnvalidatedDynamicMethodCallGood4.js:14:34:14:50 | req.params.action | semmle.label | req.params.action |
 | UnvalidatedDynamicMethodCallGood4.js:15:17:15:22 | action | semmle.label | action |
 | tst.js:6:39:6:40 | ev | semmle.label | ev |
-| tst.js:7:9:7:39 | name | semmle.label | name |
+| tst.js:7:9:7:12 | name | semmle.label | name |
 | tst.js:7:16:7:34 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:7:16:7:39 | JSON.pa ... a).name | semmle.label | JSON.pa ... a).name |
 | tst.js:7:27:7:28 | ev | semmle.label | ev |
@@ -101,7 +101,7 @@ nodes
 | tst.js:9:9:9:15 | ev.data | semmle.label | ev.data |
 | tst.js:11:5:11:13 | obj[name] | semmle.label | obj[name] |
 | tst.js:11:9:11:12 | name | semmle.label | name |
-| tst.js:17:9:17:22 | fn | semmle.label | fn |
+| tst.js:17:9:17:10 | fn | semmle.label | fn |
 | tst.js:17:14:17:22 | obj[name] | semmle.label | obj[name] |
 | tst.js:17:18:17:21 | name | semmle.label | name |
 | tst.js:18:5:18:6 | fn | semmle.label | fn |
@@ -113,7 +113,7 @@ nodes
 | tst.js:26:11:26:14 | name | semmle.label | name |
 | tst.js:28:7:28:15 | obj[name] | semmle.label | obj[name] |
 | tst.js:28:11:28:14 | name | semmle.label | name |
-| tst.js:34:9:34:24 | key | semmle.label | key |
+| tst.js:34:9:34:11 | key | semmle.label | key |
 | tst.js:34:15:34:24 | "$" + name | semmle.label | "$" + name |
 | tst.js:34:21:34:24 | name | semmle.label | name |
 | tst.js:35:5:35:12 | obj[key] | semmle.label | obj[key] |
@@ -121,12 +121,12 @@ nodes
 | tst.js:37:7:37:14 | obj[key] | semmle.label | obj[key] |
 | tst.js:37:11:37:13 | key | semmle.label | key |
 | tst.js:47:39:47:40 | ev | semmle.label | ev |
-| tst.js:48:9:48:39 | name | semmle.label | name |
+| tst.js:48:9:48:12 | name | semmle.label | name |
 | tst.js:48:16:48:34 | JSON.parse(ev.data) | semmle.label | JSON.parse(ev.data) |
 | tst.js:48:16:48:39 | JSON.pa ... a).name | semmle.label | JSON.pa ... a).name |
 | tst.js:48:27:48:28 | ev | semmle.label | ev |
 | tst.js:48:27:48:33 | ev.data | semmle.label | ev.data |
-| tst.js:49:9:49:23 | fn | semmle.label | fn |
+| tst.js:49:9:49:10 | fn | semmle.label | fn |
 | 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 |
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 0d90beb06695..886460544afe 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
@@ -20,46 +20,46 @@
 | 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 |  |
+| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:10 | 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:10 | delay | provenance |  |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | provenance |  |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | provenance | Config |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:6:20:6:20 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:35:12:35:12 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:82:17:82:17 | s | provenance |  |
-| resource-exhaustion.js:5:7:5:42 | s | resource-exhaustion.js:84:18:84:18 | s | provenance |  |
-| resource-exhaustion.js:5:11:5:34 | url.par ... , true) | resource-exhaustion.js:5:7:5:42 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:6:20:6:20 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:35:12:35:12 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:82:17:82:17 | s | provenance |  |
+| resource-exhaustion.js:5:7:5:7 | s | resource-exhaustion.js:84:18:84:18 | s | provenance |  |
+| resource-exhaustion.js:5:11:5:34 | url.par ... , true) | resource-exhaustion.js:5:7:5:7 | s | provenance |  |
 | resource-exhaustion.js:5:21:5:27 | req.url | resource-exhaustion.js:5:11:5:34 | url.par ... , true) | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:14:16:14:16 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:15:22:15:22 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:16:26:16:26 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:20:20:20:20 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:22:18:22:18 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:27:9:27:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:28:13:28:13 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:29:9:29:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:30:9:30:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:31:9:31:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:32:9:32:9 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:34:12:34:12 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:81:17:81:17 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:83:18:83:18 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:88:16:88:16 | n | provenance |  |
-| resource-exhaustion.js:6:7:6:21 | n | resource-exhaustion.js:92:18:92:18 | n | provenance |  |
-| resource-exhaustion.js:6:11:6:21 | parseInt(s) | resource-exhaustion.js:6:7:6:21 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:14:16:14:16 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:15:22:15:22 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:16:26:16:26 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:20:20:20:20 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:22:18:22:18 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:27:9:27:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:28:13:28:13 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:29:9:29:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:30:9:30:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:31:9:31:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:32:9:32:9 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:34:12:34:12 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:81:17:81:17 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:83:18:83:18 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:88:16:88:16 | n | provenance |  |
+| resource-exhaustion.js:6:7:6:7 | n | resource-exhaustion.js:92:18:92:18 | n | provenance |  |
+| resource-exhaustion.js:6:11:6:21 | parseInt(s) | resource-exhaustion.js:6:7:6:7 | n | provenance |  |
 | resource-exhaustion.js:6:20:6:20 | s | resource-exhaustion.js:6:11:6:21 | parseInt(s) | provenance | Config |
 nodes
-| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:59 | delay | semmle.label | delay |
+| documentaion-examples/ResourceExhaustion_timeout.js:5:6:5:10 | delay | semmle.label | delay |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:14:5:59 | parseIn ... .delay) | semmle.label | parseIn ... .delay) |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:46 | url.par ... , true) | semmle.label | url.par ... , true) |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:23:5:58 | url.par ... y.delay | semmle.label | url.par ... y.delay |
 | documentaion-examples/ResourceExhaustion_timeout.js:5:33:5:39 | req.url | semmle.label | req.url |
 | documentaion-examples/ResourceExhaustion_timeout.js:7:16:7:20 | delay | semmle.label | delay |
-| resource-exhaustion.js:5:7:5:42 | s | semmle.label | s |
+| resource-exhaustion.js:5:7:5:7 | s | semmle.label | s |
 | resource-exhaustion.js:5:11:5:34 | url.par ... , true) | semmle.label | url.par ... , true) |
 | resource-exhaustion.js:5:21:5:27 | req.url | semmle.label | req.url |
-| resource-exhaustion.js:6:7:6:21 | n | semmle.label | n |
+| resource-exhaustion.js:6:7:6:7 | n | semmle.label | n |
 | resource-exhaustion.js:6:11:6:21 | parseInt(s) | semmle.label | parseInt(s) |
 | resource-exhaustion.js:6:20:6:20 | s | semmle.label | s |
 | resource-exhaustion.js:14:16:14:16 | n | semmle.label | n |
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 2b4d41804915..8bb8dd8d27dc 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-776/XmlBomb.expected
@@ -5,34 +5,26 @@
 | 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: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: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:4:14:4:16 | src | provenance |  |
-| jquery.js:2:13:2:36 | documen ... .search | jquery.js:2:7:2:36 | src | provenance |  |
+| closure.js:2:7:2:9 | src | closure.js:3:24:3:26 | src | provenance |  |
+| closure.js:2:13:2:36 | documen ... .search | closure.js:2:7:2:9 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:5:37:5:39 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:9:55:9:57 | src | provenance |  |
+| domparser.js:2:7:2:9 | src | domparser.js:11:57:11:59 | src | provenance |  |
+| domparser.js:2:13:2:36 | documen ... .search | domparser.js:2:7:2:9 | src | provenance |  |
+| jquery.js:2:7:2:9 | src | jquery.js:4:14:4:16 | src | provenance |  |
+| jquery.js:2:13:2:36 | documen ... .search | jquery.js:2:7:2:9 | src | provenance |  |
 nodes
-| closure.js:2:7:2:36 | src | semmle.label | src |
+| closure.js:2:7:2:9 | src | semmle.label | src |
 | closure.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | closure.js:3:24:3:26 | src | semmle.label | src |
-| domparser.js:2:7:2:36 | src | semmle.label | src |
+| domparser.js:2:7:2:9 | src | semmle.label | src |
 | domparser.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | 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:7:2:9 | src | semmle.label | src |
 | jquery.js:2:13:2:36 | documen ... .search | semmle.label | documen ... .search |
 | 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
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 6af2da17ef5d..3f16e457dc38 100644
--- a/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
+++ b/javascript/ql/test/query-tests/Security/CWE-776/libxml.js
@@ -2,5 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  libxmljs.parseXml(req.param("some-xml")); // $ Alert - libxml expands internal general entities by default
+  libxmljs.parseXml(req.param("some-xml"));
 });
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 da133cc782e0..de633c04688a 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,5 +2,5 @@ const express = require('express');
 const libxmljs = require('libxmljs');
 
 express().get('/some/path', function(req) {
-  libxmljs.parseXml(req.param("some-xml"), { noent: true }); // $ Alert - unguarded entity expansion
+  libxmljs.parseXml(req.param("some-xml"), { noent: true });
 });
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 6049a8297a98..dc7ec2ddec00 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")); // $ Alert - the SAX parser expands external entities by default
+  parser.parseString(req.param("some-xml"));
 });
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 2fc4afc8ce47..15e63bf5d532 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")); // $ Alert - the SAX parser expands external entities by default
+  parser.push(req.param("some-xml"));
 });
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 22311127d548..965e4e51e454 100644
--- a/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-798/HardcodedCredentials.expected
@@ -172,15 +172,15 @@
 | __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 |  |
-| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:11:171:25 | USER | provenance |  |
-| HardcodedCredentials.js:172:11:172:25 | PASS | HardcodedCredentials.js:173:43:173:46 | PASS | provenance |  |
-| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:11:172:25 | PASS | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:178:39:178:42 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:188:39:188:42 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:195:46:195:49 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | HardcodedCredentials.js:204:44:204:47 | AUTH | provenance |  |
-| HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | HardcodedCredentials.js:173:11:173:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:171:11:171:14 | USER | HardcodedCredentials.js:173:35:173:38 | USER | provenance |  |
+| HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | HardcodedCredentials.js:171:11:171:14 | USER | provenance |  |
+| HardcodedCredentials.js:172:11:172:14 | PASS | HardcodedCredentials.js:173:43:173:46 | PASS | provenance |  |
+| HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | HardcodedCredentials.js:172:11:172:14 | PASS | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:178:39:178:42 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:188:39:188:42 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:195:46:195:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | HardcodedCredentials.js:204:44:204:47 | AUTH | provenance |  |
+| HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | HardcodedCredentials.js:173:11:173:14 | AUTH | provenance |  |
 | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | provenance | Config |
 | HardcodedCredentials.js:173:35:173:38 | USER | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:173:43:173:46 | PASS | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | provenance | Config |
@@ -188,54 +188,54 @@ edges
 | HardcodedCredentials.js:188:39:188:42 | AUTH | HardcodedCredentials.js:188:30:188:44 | `Basic ${AUTH}` | provenance | Config |
 | HardcodedCredentials.js:195:46:195:49 | AUTH | HardcodedCredentials.js:195:37:195:51 | `Basic ${AUTH}` | provenance | Config |
 | HardcodedCredentials.js:204:44:204:47 | AUTH | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | provenance | Config |
-| HardcodedCredentials.js:214:11:214:25 | USER | HardcodedCredentials.js:216:35:216:38 | USER | provenance |  |
-| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:11:214:25 | USER | provenance |  |
-| HardcodedCredentials.js:215:11:215:25 | PASS | HardcodedCredentials.js:216:43:216:46 | PASS | provenance |  |
-| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:11:215:25 | PASS | provenance |  |
-| HardcodedCredentials.js:216:11:216:49 | AUTH | HardcodedCredentials.js:221:46:221:49 | AUTH | provenance |  |
-| HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | HardcodedCredentials.js:216:11:216:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:214:11:214:14 | USER | HardcodedCredentials.js:216:35:216:38 | USER | provenance |  |
+| HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | HardcodedCredentials.js:214:11:214:14 | USER | provenance |  |
+| HardcodedCredentials.js:215:11:215:14 | PASS | HardcodedCredentials.js:216:43:216:46 | PASS | provenance |  |
+| HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | HardcodedCredentials.js:215:11:215:14 | PASS | provenance |  |
+| HardcodedCredentials.js:216:11:216:14 | AUTH | HardcodedCredentials.js:221:46:221:49 | AUTH | provenance |  |
+| HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | HardcodedCredentials.js:216:11:216:14 | AUTH | provenance |  |
 | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | provenance | Config |
 | HardcodedCredentials.js:216:35:216:38 | USER | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:216:43:216:46 | PASS | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | provenance | Config |
 | HardcodedCredentials.js:221:46:221:49 | AUTH | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | provenance | Config |
-| HardcodedCredentials.js:231:11:231:29 | username | HardcodedCredentials.js:237:47:237:54 | username | provenance |  |
-| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:11:231:29 | username | provenance |  |
+| HardcodedCredentials.js:231:11:231:18 | username | HardcodedCredentials.js:237:47:237:54 | username | provenance |  |
+| HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | HardcodedCredentials.js:231:11:231:18 | username | provenance |  |
 | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | provenance | Config |
 | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | provenance | Config |
 | HardcodedCredentials.js:237:47:237:54 | username | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | provenance | Config |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | provenance | Config |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | provenance | Config |
-| HardcodedCredentials.js:245:9:245:44 | privateKey | HardcodedCredentials.js:246:42:246:51 | privateKey | provenance |  |
-| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:9:245:44 | privateKey | provenance |  |
-| HardcodedCredentials.js:248:9:248:42 | publicKey | HardcodedCredentials.js:249:23:249:31 | publicKey | provenance |  |
-| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:9:248:42 | publicKey | provenance |  |
+| HardcodedCredentials.js:245:9:245:18 | privateKey | HardcodedCredentials.js:246:42:246:51 | privateKey | provenance |  |
+| HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | HardcodedCredentials.js:245:9:245:18 | privateKey | provenance |  |
+| HardcodedCredentials.js:248:9:248:17 | publicKey | HardcodedCredentials.js:249:23:249:31 | publicKey | provenance |  |
+| HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | HardcodedCredentials.js:248:9:248:17 | publicKey | provenance |  |
 | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | HardcodedCredentials.js:268:30:268:73 | `${foo  ... Token}` | provenance | Config |
 | HardcodedCredentials.js:268:39:268:46 | 'Bearer' | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | provenance |  |
 | HardcodedCredentials.js:268:50:268:56 | 'OAuth' | HardcodedCredentials.js:268:33:268:56 | foo ? ' ... 'OAuth' | provenance |  |
-| HardcodedCredentials.js:308:9:308:44 | privateKey | HardcodedCredentials.js:309:34:309:43 | privateKey | provenance |  |
-| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:9:308:44 | privateKey | provenance |  |
-| HardcodedCredentials.js:316:9:316:44 | privateKey | HardcodedCredentials.js:317:52:317:61 | privateKey | provenance |  |
-| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:9:316:44 | privateKey | provenance |  |
+| HardcodedCredentials.js:308:9:308:18 | privateKey | HardcodedCredentials.js:309:34:309:43 | privateKey | provenance |  |
+| HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | HardcodedCredentials.js:308:9:308:18 | privateKey | provenance |  |
+| HardcodedCredentials.js:316:9:316:18 | privateKey | HardcodedCredentials.js:317:52:317:61 | privateKey | provenance |  |
+| HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | HardcodedCredentials.js:316:9:316:18 | privateKey | provenance |  |
 | HardcodedCredentials.js:317:52:317:61 | privateKey | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | provenance | Config |
-| HardcodedCredentials.js:319:11:321:29 | spki | HardcodedCredentials.js:322:43:322:46 | spki | provenance |  |
-| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:11:321:29 | spki | provenance |  |
-| HardcodedCredentials.js:322:9:322:56 | publicKey | HardcodedCredentials.js:323:27:323:35 | publicKey | provenance |  |
-| HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | HardcodedCredentials.js:322:9:322:56 | publicKey | provenance |  |
+| HardcodedCredentials.js:319:11:319:14 | spki | HardcodedCredentials.js:322:43:322:46 | spki | provenance |  |
+| HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | HardcodedCredentials.js:319:11:319:14 | spki | provenance |  |
+| HardcodedCredentials.js:322:9:322:17 | publicKey | HardcodedCredentials.js:323:27:323:35 | publicKey | provenance |  |
+| HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | HardcodedCredentials.js:322:9:322:17 | publicKey | provenance |  |
 | HardcodedCredentials.js:322:43:322:46 | spki | HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | provenance | Config |
 | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | provenance | Config |
-| HardcodedCredentials.js:331:5:331:46 | publicKey | HardcodedCredentials.js:335:31:335:39 | publicKey | provenance |  |
-| HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | HardcodedCredentials.js:331:5:331:46 | publicKey | provenance |  |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | HardcodedCredentials.js:349:21:349:29 | secretKey | provenance |  |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | HardcodedCredentials.js:360:33:360:41 | secretKey | provenance |  |
-| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:9:344:43 | secretKey | provenance |  |
+| HardcodedCredentials.js:331:5:331:13 | publicKey | HardcodedCredentials.js:335:31:335:39 | publicKey | provenance |  |
+| HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | HardcodedCredentials.js:331:5:331:13 | publicKey | provenance |  |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | HardcodedCredentials.js:349:21:349:29 | secretKey | provenance |  |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | HardcodedCredentials.js:360:33:360:41 | secretKey | provenance |  |
+| HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | HardcodedCredentials.js:344:9:344:17 | secretKey | provenance |  |
 | HardcodedCredentials.js:360:33:360:41 | secretKey | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | provenance | Config |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | HardcodedCredentials.js:378:24:378:32 | secretKey | provenance |  |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | HardcodedCredentials.js:385:31:385:39 | secretKey | provenance |  |
-| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:9:375:43 | secretKey | provenance |  |
-| HardcodedCredentials.js:396:9:396:43 | secretKey | HardcodedCredentials.js:399:17:399:25 | secretKey | provenance |  |
-| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:9:396:43 | secretKey | provenance |  |
-| HardcodedCredentials.js:414:9:414:43 | secretKey | HardcodedCredentials.js:416:27:416:35 | secretKey | provenance |  |
-| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:9:414:43 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | HardcodedCredentials.js:378:24:378:32 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | HardcodedCredentials.js:385:31:385:39 | secretKey | provenance |  |
+| HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | HardcodedCredentials.js:375:9:375:17 | secretKey | provenance |  |
+| HardcodedCredentials.js:396:9:396:17 | secretKey | HardcodedCredentials.js:399:17:399:25 | secretKey | provenance |  |
+| HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | HardcodedCredentials.js:396:9:396:17 | secretKey | provenance |  |
+| HardcodedCredentials.js:414:9:414:17 | secretKey | HardcodedCredentials.js:416:27:416:35 | secretKey | provenance |  |
+| HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | HardcodedCredentials.js:414:9:414:17 | secretKey | provenance |  |
 nodes
 | HardcodedCredentials.js:5:15:5:22 | 'dbuser' | semmle.label | 'dbuser' |
 | HardcodedCredentials.js:8:19:8:28 | 'hgfedcba' | semmle.label | 'hgfedcba' |
@@ -292,11 +292,11 @@ nodes
 | HardcodedCredentials.js:160:38:160:56 | "oiuneawrgiyubaegr" | semmle.label | "oiuneawrgiyubaegr" |
 | HardcodedCredentials.js:161:41:161:59 | 'oiuneawrgiyubaegr' | semmle.label | 'oiuneawrgiyubaegr' |
 | HardcodedCredentials.js:164:35:164:45 | 'change_me' | semmle.label | 'change_me' |
-| HardcodedCredentials.js:171:11:171:25 | USER | semmle.label | USER |
+| HardcodedCredentials.js:171:11:171:14 | USER | semmle.label | USER |
 | HardcodedCredentials.js:171:18:171:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:172:11:172:25 | PASS | semmle.label | PASS |
+| HardcodedCredentials.js:172:11:172:14 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:172:18:172:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:173:11:173:49 | AUTH | semmle.label | AUTH |
+| HardcodedCredentials.js:173:11:173:14 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:173:18:173:49 | base64. ... PASS}`) | semmle.label | base64. ... PASS}`) |
 | HardcodedCredentials.js:173:32:173:48 | `${USER}:${PASS}` | semmle.label | `${USER}:${PASS}` |
 | HardcodedCredentials.js:173:35:173:38 | USER | semmle.label | USER |
@@ -309,28 +309,28 @@ nodes
 | HardcodedCredentials.js:195:46:195:49 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:204:35:204:49 | `Basic ${AUTH}` | semmle.label | `Basic ${AUTH}` |
 | HardcodedCredentials.js:204:44:204:47 | AUTH | semmle.label | AUTH |
-| HardcodedCredentials.js:214:11:214:25 | USER | semmle.label | USER |
+| HardcodedCredentials.js:214:11:214:14 | USER | semmle.label | USER |
 | HardcodedCredentials.js:214:18:214:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:215:11:215:25 | PASS | semmle.label | PASS |
+| HardcodedCredentials.js:215:11:215:14 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:215:18:215:25 | 'sdsdag' | semmle.label | 'sdsdag' |
-| HardcodedCredentials.js:216:11:216:49 | AUTH | semmle.label | AUTH |
+| HardcodedCredentials.js:216:11:216:14 | AUTH | semmle.label | AUTH |
 | HardcodedCredentials.js:216:18:216:49 | base64. ... PASS}`) | semmle.label | base64. ... PASS}`) |
 | HardcodedCredentials.js:216:32:216:48 | `${USER}:${PASS}` | semmle.label | `${USER}:${PASS}` |
 | HardcodedCredentials.js:216:35:216:38 | USER | semmle.label | USER |
 | HardcodedCredentials.js:216:43:216:46 | PASS | semmle.label | PASS |
 | HardcodedCredentials.js:221:37:221:51 | `Basic ${AUTH}` | semmle.label | `Basic ${AUTH}` |
 | HardcodedCredentials.js:221:46:221:49 | AUTH | semmle.label | AUTH |
-| HardcodedCredentials.js:231:11:231:29 | username | semmle.label | username |
+| HardcodedCredentials.js:231:11:231:18 | username | semmle.label | username |
 | HardcodedCredentials.js:231:22:231:29 | 'sdsdag' | semmle.label | 'sdsdag' |
 | HardcodedCredentials.js:237:24:237:91 | 'Basic  ... ase64') | semmle.label | 'Basic  ... ase64') |
 | HardcodedCredentials.js:237:35:237:72 | Buffer. ... ssword) | semmle.label | Buffer. ... ssword) |
 | HardcodedCredentials.js:237:35:237:91 | Buffer. ... ase64') | semmle.label | Buffer. ... ase64') |
 | HardcodedCredentials.js:237:47:237:54 | username | semmle.label | username |
 | HardcodedCredentials.js:237:47:237:71 | usernam ... assword | semmle.label | usernam ... assword |
-| HardcodedCredentials.js:245:9:245:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:245:9:245:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:245:22:245:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:246:42:246:51 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:248:9:248:42 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:248:9:248:17 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:248:21:248:42 | "myHard ... licKey" | semmle.label | "myHard ... licKey" |
 | HardcodedCredentials.js:249:23:249:31 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:260:30:260:40 | `Basic foo` | semmle.label | `Basic foo` |
@@ -358,36 +358,36 @@ nodes
 | HardcodedCredentials.js:300:44:300:56 | 'SampleToken' | semmle.label | 'SampleToken' |
 | HardcodedCredentials.js:301:44:301:55 | 'MyPassword' | semmle.label | 'MyPassword' |
 | HardcodedCredentials.js:302:44:302:69 | 'iubfew ... ybgera' | semmle.label | 'iubfew ... ybgera' |
-| HardcodedCredentials.js:308:9:308:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:308:9:308:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:308:22:308:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:309:34:309:43 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:316:9:316:44 | privateKey | semmle.label | privateKey |
+| HardcodedCredentials.js:316:9:316:18 | privateKey | semmle.label | privateKey |
 | HardcodedCredentials.js:316:22:316:44 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:317:27:317:62 | new Tex ... ateKey) | semmle.label | new Tex ... ateKey) |
 | HardcodedCredentials.js:317:52:317:61 | privateKey | semmle.label | privateKey |
-| HardcodedCredentials.js:319:11:321:29 | spki | semmle.label | spki |
+| HardcodedCredentials.js:319:11:319:14 | spki | semmle.label | spki |
 | HardcodedCredentials.js:319:18:321:29 | `-----B ... Y-----` | semmle.label | `-----B ... Y-----` |
-| HardcodedCredentials.js:322:9:322:56 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:322:9:322:17 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:322:21:322:56 | await j ... RS256') | semmle.label | await j ... RS256') |
 | HardcodedCredentials.js:322:43:322:46 | spki | semmle.label | spki |
 | HardcodedCredentials.js:323:27:323:35 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:328:12:328:55 | 'whYOFK ... -6f...' | semmle.label | 'whYOFK ... -6f...' |
-| HardcodedCredentials.js:331:5:331:46 | publicKey | semmle.label | publicKey |
+| HardcodedCredentials.js:331:5:331:13 | publicKey | semmle.label | publicKey |
 | HardcodedCredentials.js:331:17:331:46 | await j ... k, alg) | semmle.label | await j ... k, alg) |
 | HardcodedCredentials.js:335:31:335:39 | publicKey | semmle.label | publicKey |
-| HardcodedCredentials.js:344:9:344:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:344:9:344:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:344:21:344:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:349:21:349:29 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:360:21:360:52 | Buffer. ... ase64") | semmle.label | Buffer. ... ase64") |
 | HardcodedCredentials.js:360:33:360:41 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:375:9:375:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:375:9:375:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:375:21:375:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:378:24:378:32 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:385:31:385:39 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:396:9:396:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:396:9:396:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:396:21:396:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:399:17:399:25 | secretKey | semmle.label | secretKey |
-| HardcodedCredentials.js:414:9:414:43 | secretKey | semmle.label | secretKey |
+| HardcodedCredentials.js:414:9:414:17 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:414:21:414:43 | "myHard ... ateKey" | semmle.label | "myHard ... ateKey" |
 | HardcodedCredentials.js:416:27:416:35 | secretKey | semmle.label | secretKey |
 | HardcodedCredentials.js:423:43:423:53 | "AccessID1" | semmle.label | "AccessID1" |
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 8743571bbbcd..ea9f656fb516 100644
--- a/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-807/ConditionalBypass.expected
@@ -13,8 +13,8 @@ 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 |  |
 | tst.js:24:17:24:17 | v | tst.js:25:16:25:16 | v | provenance |  |
-| tst.js:27:9:27:37 | v3 | tst.js:28:9:28:10 | v3 | provenance |  |
-| tst.js:27:14:27:37 | id(req. ... okieId) | tst.js:27:9:27:37 | v3 | provenance |  |
+| tst.js:27:9:27:10 | v3 | tst.js:28:9:28:10 | v3 | provenance |  |
+| tst.js:27:14:27:37 | id(req. ... okieId) | tst.js:27:9:27:10 | v3 | provenance |  |
 | tst.js:27:17:27:27 | req.cookies | tst.js:27:17:27:36 | req.cookies.cookieId | provenance |  |
 | tst.js:27:17:27:36 | req.cookies.cookieId | tst.js:24:17:24:17 | v | provenance |  |
 | tst.js:27:17:27:36 | req.cookies.cookieId | tst.js:27:14:27:37 | id(req. ... okieId) | provenance |  |
@@ -35,7 +35,7 @@ nodes
 | tst.js:13:9:13:30 | req.coo ... inThing | semmle.label | req.coo ... inThing |
 | tst.js:24:17:24:17 | v | semmle.label | v |
 | tst.js:25:16:25:16 | v | semmle.label | v |
-| tst.js:27:9:27:37 | v3 | semmle.label | v3 |
+| tst.js:27:9:27:10 | v3 | semmle.label | v3 |
 | tst.js:27:14:27:37 | id(req. ... okieId) | semmle.label | id(req. ... okieId) |
 | tst.js:27:17:27:27 | req.cookies | semmle.label | req.cookies |
 | tst.js:27:17:27:36 | req.cookies.cookieId | semmle.label | req.cookies.cookieId |
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 e430335b97b7..5c9f10f56214 100644
--- a/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-829/InsecureDownload.expected
@@ -6,12 +6,12 @@
 | 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 |  |
+| insecure-download.js:36:9:36:11 | url | insecure-download.js:37:23:37:25 | url | provenance |  |
+| insecure-download.js:36:9:36:11 | 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:11 | 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 |
+| insecure-download.js:36:9:36:11 | url | semmle.label | url |
 | insecure-download.js:36:15:36:45 | "http:/ ... fe.APK" | semmle.label | "http:/ ... fe.APK" |
 | insecure-download.js:37:23:37:25 | url | semmle.label | url |
 | insecure-download.js:39:26:39:28 | url | semmle.label | url |
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 b07e1c194a45..39ef0ef3318f 100644
--- a/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-843/TypeConfusionThroughParameterTampering.expected
@@ -14,21 +14,21 @@
 | 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 |  |
-| tst.js:5:9:5:27 | foo | tst.js:8:5:8:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:8:5:8:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:17:7:17:9 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:21:5:21:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:22:5:22:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:23:5:23:7 | foo | provenance |  |
-| tst.js:5:9:5:27 | foo | tst.js:25:5:25: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: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:5:9:5:11 | foo | tst.js:6:5:6:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:6:5:6:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:8:5:8:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:8:5:8:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:17:7:17:9 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:21:5:21:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:22:5:22:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:23:5:23:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:25:5:25:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:27:5:27:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:27:5:27:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:28:5:28:7 | foo | provenance |  |
+| tst.js:5:9:5:11 | foo | tst.js:30:5:30:7 | foo | provenance |  |
+| tst.js:5:15:5:27 | req.query.foo | tst.js:5:9:5:11 | 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 ... t\\n    } [foo] | provenance |  |
@@ -48,15 +48,15 @@ edges
 | 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:47:9:47:11 | foo | tst.js:48:5:48:7 | foo | provenance |  |
+| tst.js:47:15:47:35 | ctx.req ... ery.foo | tst.js:47:9:47:11 | 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 |  |
+| tst.js:105:9:105:12 | data | tst.js:106:5:106:8 | data | provenance |  |
+| tst.js:105:16:105:29 | req.query.data | tst.js:105:9:105:12 | data | provenance |  |
 nodes
-| tst.js:5:9:5:27 | foo | semmle.label | foo |
+| tst.js:5:9:5:11 | foo | semmle.label | foo |
 | tst.js:5:15:5:27 | req.query.foo | semmle.label | req.query.foo |
 | tst.js:6:5:6:7 | foo | semmle.label | foo |
 | tst.js:6:5:6:7 | foo | semmle.label | foo |
@@ -78,7 +78,7 @@ nodes
 | 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:9:47:11 | 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 |
@@ -88,7 +88,7 @@ nodes
 | 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:9:105:12 | 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
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 67aadb32c311..c2fddac0ce35 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
@@ -29,59 +29,59 @@
 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 |  |
-| lib.js:2:7:2:27 | currentPath | lib.js:11:21:11:31 | currentPath | provenance |  |
+| lib.js:2:7:2:17 | currentPath | lib.js:11:21:11:31 | currentPath | provenance |  |
 | lib.js:2:21:2:24 | path | lib.js:2:21:2:27 | path[0] | provenance | Config |
-| lib.js:2:21:2:27 | path[0] | lib.js:2:7:2:27 | currentPath | provenance |  |
+| lib.js:2:21:2:27 | path[0] | lib.js:2:7:2:17 | currentPath | provenance |  |
 | lib.js:11:17:11:32 | obj[currentPath] | lib.js:1:38:1:40 | obj | provenance |  |
 | lib.js:11:21:11:31 | currentPath | lib.js:11:17:11:32 | obj[currentPath] | provenance | Config |
 | lib.js:14:38:14:41 | path | lib.js:15:7:15:10 | path | provenance |  |
 | lib.js:15:7:15:10 | path | lib.js:15:7:15:13 | path[0] | provenance | Config |
 | lib.js:15:7:15:13 | path[0] | lib.js:15:3:15:14 | obj[path[0]] | provenance | Config |
-| lib.js:20:7:20:25 | path | lib.js:22:7:22:10 | path | provenance |  |
+| lib.js:20:7:20:10 | path | lib.js:22:7:22:10 | path | provenance |  |
 | lib.js:20:14:20:22 | arguments | lib.js:20:14:20:25 | arguments[1] | provenance | Config |
-| lib.js:20:14:20:25 | arguments[1] | lib.js:20:7:20:25 | path | provenance |  |
+| lib.js:20:14:20:25 | arguments[1] | lib.js:20:7:20:10 | path | provenance |  |
 | lib.js:22:7:22:10 | path | lib.js:22:7:22:13 | path[0] | provenance | Config |
 | lib.js:22:7:22:13 | path[0] | lib.js:22:3:22:14 | obj[path[0]] | provenance | Config |
 | lib.js:25:44:25:47 | path | lib.js:26:14:26:17 | path | provenance |  |
 | lib.js:26:14:26:17 | path | lib.js:26:14:26:20 | path[0] | provenance | Config |
 | lib.js:26:14:26:20 | path[0] | lib.js:26:10:26:21 | obj[path[0]] | provenance | Config |
-| lib.js:30:9:30:52 | args | lib.js:32:14:32:17 | args | provenance |  |
-| lib.js:30:9:30:52 | args [ArrayElement] | lib.js:32:14:32:17 | args [ArrayElement] | provenance |  |
-| lib.js:30:16:30:52 | Array.p ... uments) | lib.js:30:9:30:52 | args | provenance |  |
-| lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | lib.js:30:9:30:52 | args [ArrayElement] | provenance |  |
+| lib.js:30:9:30:12 | args | lib.js:32:14:32:17 | args | provenance |  |
+| lib.js:30:9:30:12 | args [ArrayElement] | lib.js:32:14:32:17 | args [ArrayElement] | provenance |  |
+| lib.js:30:16:30:52 | Array.p ... uments) | lib.js:30:9:30:12 | args | provenance |  |
+| lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | lib.js:30:9:30:12 | args [ArrayElement] | provenance |  |
 | lib.js:30:16:30:52 | reflective call | lib.js:30:16:30:52 | Array.p ... uments) | provenance |  |
 | lib.js:30:16:30:52 | reflective call [ArrayElement] | lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | provenance |  |
 | lib.js:30:43:30:51 | arguments | lib.js:30:16:30:52 | reflective call | provenance | Config |
 | lib.js:30:43:30:51 | arguments | lib.js:30:16:30:52 | reflective call [ArrayElement] | provenance | Config |
-| lib.js:32:7:32:20 | path | lib.js:34:7:34:10 | path | provenance |  |
+| lib.js:32:7:32:10 | path | lib.js:34:7:34:10 | path | provenance |  |
 | lib.js:32:14:32:17 | args | lib.js:32:14:32:20 | args[1] | provenance | Config |
 | lib.js:32:14:32:17 | args [ArrayElement] | lib.js:32:14:32:20 | args[1] | provenance |  |
-| lib.js:32:14:32:20 | args[1] | lib.js:32:7:32:20 | path | provenance |  |
+| lib.js:32:14:32:20 | args[1] | lib.js:32:7:32:10 | path | provenance |  |
 | lib.js:34:7:34:10 | path | lib.js:34:7:34:13 | path[0] | provenance | Config |
 | lib.js:34:7:34:13 | path[0] | lib.js:34:3:34:14 | obj[path[0]] | provenance | Config |
-| lib.js:38:9:38:36 | args | lib.js:40:14:40:17 | args | provenance |  |
-| lib.js:38:16:38:36 | Array.f ... uments) | lib.js:38:9:38:36 | args | provenance |  |
+| lib.js:38:9:38:12 | args | lib.js:40:14:40:17 | args | provenance |  |
+| lib.js:38:16:38:36 | Array.f ... uments) | lib.js:38:9:38:12 | args | provenance |  |
 | lib.js:38:27:38:35 | arguments | lib.js:38:16:38:36 | Array.f ... uments) | provenance | Config |
-| lib.js:40:7:40:20 | path | lib.js:42:7:42:10 | path | provenance |  |
+| lib.js:40:7:40:10 | path | lib.js:42:7:42:10 | path | provenance |  |
 | lib.js:40:14:40:17 | args | lib.js:40:14:40:20 | args[1] | provenance | Config |
-| lib.js:40:14:40:20 | args[1] | lib.js:40:7:40:20 | path | provenance |  |
+| lib.js:40:14:40:20 | args[1] | lib.js:40:7:40:10 | path | provenance |  |
 | lib.js:42:7:42:10 | path | lib.js:42:7:42:13 | path[0] | provenance | Config |
 | lib.js:42:7:42:13 | path[0] | lib.js:42:3:42:14 | obj[path[0]] | provenance | Config |
-| lib.js:83:7:83:25 | path | lib.js:86:19:86:22 | path | provenance |  |
+| lib.js:83:7:83:10 | path | lib.js:86:19:86:22 | path | provenance |  |
 | lib.js:83:14:83:22 | arguments | lib.js:83:14:83:25 | arguments[1] | provenance | Config |
-| lib.js:83:14:83:25 | arguments[1] | lib.js:83:7:83:25 | path | provenance |  |
-| lib.js:86:7:86:26 | proto | lib.js:87:10:87:14 | proto | provenance |  |
-| lib.js:86:15:86:26 | obj[path[0]] | lib.js:86:7:86:26 | proto | provenance |  |
+| lib.js:83:14:83:25 | arguments[1] | lib.js:83:7:83:10 | path | provenance |  |
+| lib.js:86:7:86:11 | proto | lib.js:87:10:87:14 | proto | provenance |  |
+| lib.js:86:15:86:26 | obj[path[0]] | lib.js:86:7:86:11 | proto | provenance |  |
 | lib.js:86:19:86:22 | path | lib.js:86:19:86:25 | path[0] | provenance | Config |
 | lib.js:86:19:86:25 | path[0] | lib.js:86:15:86:26 | obj[path[0]] | provenance | Config |
 | lib.js:90:43:90:46 | path | lib.js:91:24:91:27 | path | provenance |  |
-| lib.js:91:7:91:28 | maybeProto | lib.js:92:3:92:12 | maybeProto | provenance |  |
-| lib.js:91:7:91:28 | maybeProto | lib.js:95:3:95:12 | maybeProto | provenance |  |
-| lib.js:91:20:91:28 | obj[path] | lib.js:91:7:91:28 | maybeProto | provenance |  |
+| lib.js:91:7:91:16 | maybeProto | lib.js:92:3:92:12 | maybeProto | provenance |  |
+| lib.js:91:7:91:16 | maybeProto | lib.js:95:3:95:12 | maybeProto | provenance |  |
+| lib.js:91:20:91:28 | obj[path] | lib.js:91:7:91:16 | maybeProto | provenance |  |
 | lib.js:91:24:91:27 | path | lib.js:91:20:91:28 | obj[path] | provenance | Config |
-| lib.js:104:7:104:24 | one | lib.js:108:7:108:9 | one | provenance |  |
+| lib.js:104:7:104:9 | one | lib.js:108:7:108:9 | one | provenance |  |
 | lib.js:104:13:104:21 | arguments | lib.js:104:13:104:24 | arguments[1] | provenance | Config |
-| lib.js:104:13:104:24 | arguments[1] | lib.js:104:7:104:24 | one | provenance |  |
+| lib.js:104:13:104:24 | arguments[1] | lib.js:104:7:104:9 | one | provenance |  |
 | lib.js:108:7:108:9 | one | lib.js:108:3:108:10 | obj[one] | provenance | Config |
 | lib.js:118:29:118:32 | path | lib.js:119:17:119:20 | path | provenance |  |
 | lib.js:119:17:119:20 | path | lib.js:119:17:119:23 | path[0] | provenance | Config |
@@ -98,11 +98,11 @@ edges
 | sublib/sub.js:1:37:1:40 | path | sublib/sub.js:2:7:2:10 | path | provenance |  |
 | sublib/sub.js:2:7:2:10 | path | sublib/sub.js:2:7:2:13 | path[0] | provenance | Config |
 | sublib/sub.js:2:7:2:13 | path[0] | sublib/sub.js:2:3:2:14 | obj[path[0]] | provenance | Config |
-| tst.js:5:9:5:38 | taint | tst.js:8:12:8:16 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:9:12:9:16 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:12:25:12:29 | taint | provenance |  |
-| tst.js:5:9:5:38 | taint | tst.js:14:27:14:31 | taint | provenance |  |
-| tst.js:5:17:5:38 | String( ... y.data) | tst.js:5:9:5:38 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:8:12:8:16 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:9:12:9:16 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:12:25:12:29 | taint | provenance |  |
+| tst.js:5:9:5:13 | taint | tst.js:14:27:14:31 | taint | provenance |  |
+| tst.js:5:17:5:38 | String( ... y.data) | tst.js:5:9:5:13 | taint | provenance |  |
 | tst.js:5:24:5:37 | req.query.data | tst.js:5:17:5:38 | String( ... y.data) | provenance | Config |
 | tst.js:8:12:8:16 | taint | tst.js:8:5:8:17 | object[taint] | provenance | Config |
 | tst.js:9:12:9:16 | taint | tst.js:9:5:9:17 | object[taint] | provenance | Config |
@@ -117,10 +117,10 @@ edges
 | tst.js:55:29:55:32 | prop | tst.js:56:22:56:25 | prop | provenance |  |
 | tst.js:56:18:56:26 | obj[prop] | tst.js:56:12:56:33 | obj ? o ...  : null | provenance |  |
 | tst.js:56:22:56:25 | prop | tst.js:56:18:56:26 | obj[prop] | provenance | Config |
-| tst.js:77:9:77:38 | taint | tst.js:80:12:80:16 | taint | provenance |  |
-| tst.js:77:9:77:38 | taint | tst.js:82:17:82:21 | taint | provenance |  |
-| tst.js:77:9:77:38 | taint | tst.js:87:16:87:20 | taint | provenance |  |
-| tst.js:77:17:77:38 | String( ... y.data) | tst.js:77:9:77:38 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:80:12:80:16 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:82:17:82:21 | taint | provenance |  |
+| tst.js:77:9:77:13 | taint | tst.js:87:16:87:20 | taint | provenance |  |
+| tst.js:77:17:77:38 | String( ... y.data) | tst.js:77:9:77:13 | taint | provenance |  |
 | tst.js:77:24:77:37 | req.query.data | tst.js:77:17:77:38 | String( ... y.data) | provenance | Config |
 | tst.js:80:12:80:16 | taint | tst.js:80:5:80:17 | object[taint] | provenance | Config |
 | tst.js:82:12:82:21 | "" + taint | tst.js:82:5:82:22 | object["" + taint] | provenance | Config |
@@ -130,8 +130,8 @@ edges
 | tst.js:94:9:94:36 | req.que ... _', '') | tst.js:94:5:94:37 | obj[req ... ', '')] | provenance | Config |
 | tst.js:97:9:97:19 | req.query.x | tst.js:97:9:97:45 | req.que ... /g, '') | provenance | Config |
 | tst.js:97:9:97:45 | req.que ... /g, '') | tst.js:97:5:97:46 | obj[req ... g, '')] | provenance | Config |
-| tst.js:102:9:102:38 | taint | tst.js:105:12:105:16 | taint | provenance |  |
-| tst.js:102:17:102:38 | String( ... y.data) | tst.js:102:9:102:38 | taint | provenance |  |
+| tst.js:102:9:102:13 | taint | tst.js:105:12:105:16 | taint | provenance |  |
+| tst.js:102:17:102:38 | String( ... y.data) | tst.js:102:9:102:13 | taint | provenance |  |
 | tst.js:102:24:102:37 | req.query.data | tst.js:102:17:102:38 | String( ... y.data) | provenance | Config |
 | tst.js:105:12:105:16 | taint | tst.js:105:5:105:17 | object[taint] | provenance | Config |
 | tst.js:130:9:130:19 | req.query.x | tst.js:130:9:130:52 | req.que ... '), '') | provenance | Config |
@@ -139,7 +139,7 @@ edges
 nodes
 | lib.js:1:38:1:40 | obj | semmle.label | obj |
 | lib.js:1:43:1:46 | path | semmle.label | path |
-| lib.js:2:7:2:27 | currentPath | semmle.label | currentPath |
+| lib.js:2:7:2:17 | currentPath | semmle.label | currentPath |
 | lib.js:2:21:2:24 | path | semmle.label | path |
 | lib.js:2:21:2:27 | path[0] | semmle.label | path[0] |
 | lib.js:6:7:6:9 | obj | semmle.label | obj |
@@ -149,7 +149,7 @@ nodes
 | lib.js:15:3:15:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:15:7:15:10 | path | semmle.label | path |
 | lib.js:15:7:15:13 | path[0] | semmle.label | path[0] |
-| lib.js:20:7:20:25 | path | semmle.label | path |
+| lib.js:20:7:20:10 | path | semmle.label | path |
 | lib.js:20:14:20:22 | arguments | semmle.label | arguments |
 | lib.js:20:14:20:25 | arguments[1] | semmle.label | arguments[1] |
 | lib.js:22:3:22:14 | obj[path[0]] | semmle.label | obj[path[0]] |
@@ -159,44 +159,44 @@ nodes
 | lib.js:26:10:26:21 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:26:14:26:17 | path | semmle.label | path |
 | lib.js:26:14:26:20 | path[0] | semmle.label | path[0] |
-| lib.js:30:9:30:52 | args | semmle.label | args |
-| lib.js:30:9:30:52 | args [ArrayElement] | semmle.label | args [ArrayElement] |
+| lib.js:30:9:30:12 | args | semmle.label | args |
+| lib.js:30:9:30:12 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | lib.js:30:16:30:52 | Array.p ... uments) | semmle.label | Array.p ... uments) |
 | lib.js:30:16:30:52 | Array.p ... uments) [ArrayElement] | semmle.label | Array.p ... uments) [ArrayElement] |
 | lib.js:30:16:30:52 | reflective call | semmle.label | reflective call |
 | lib.js:30:16:30:52 | reflective call [ArrayElement] | semmle.label | reflective call [ArrayElement] |
 | lib.js:30:43:30:51 | arguments | semmle.label | arguments |
-| lib.js:32:7:32:20 | path | semmle.label | path |
+| lib.js:32:7:32:10 | path | semmle.label | path |
 | lib.js:32:14:32:17 | args | semmle.label | args |
 | lib.js:32:14:32:17 | args [ArrayElement] | semmle.label | args [ArrayElement] |
 | lib.js:32:14:32:20 | args[1] | semmle.label | args[1] |
 | lib.js:34:3:34:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:34:7:34:10 | path | semmle.label | path |
 | lib.js:34:7:34:13 | path[0] | semmle.label | path[0] |
-| lib.js:38:9:38:36 | args | semmle.label | args |
+| lib.js:38:9:38:12 | args | semmle.label | args |
 | lib.js:38:16:38:36 | Array.f ... uments) | semmle.label | Array.f ... uments) |
 | lib.js:38:27:38:35 | arguments | semmle.label | arguments |
-| lib.js:40:7:40:20 | path | semmle.label | path |
+| lib.js:40:7:40:10 | path | semmle.label | path |
 | lib.js:40:14:40:17 | args | semmle.label | args |
 | lib.js:40:14:40:20 | args[1] | semmle.label | args[1] |
 | lib.js:42:3:42:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:42:7:42:10 | path | semmle.label | path |
 | lib.js:42:7:42:13 | path[0] | semmle.label | path[0] |
-| lib.js:83:7:83:25 | path | semmle.label | path |
+| lib.js:83:7:83:10 | path | semmle.label | path |
 | lib.js:83:14:83:22 | arguments | semmle.label | arguments |
 | lib.js:83:14:83:25 | arguments[1] | semmle.label | arguments[1] |
-| lib.js:86:7:86:26 | proto | semmle.label | proto |
+| lib.js:86:7:86:11 | proto | semmle.label | proto |
 | lib.js:86:15:86:26 | obj[path[0]] | semmle.label | obj[path[0]] |
 | lib.js:86:19:86:22 | path | semmle.label | path |
 | lib.js:86:19:86:25 | path[0] | semmle.label | path[0] |
 | lib.js:87:10:87:14 | proto | semmle.label | proto |
 | lib.js:90:43:90:46 | path | semmle.label | path |
-| lib.js:91:7:91:28 | maybeProto | semmle.label | maybeProto |
+| lib.js:91:7:91:16 | maybeProto | semmle.label | maybeProto |
 | lib.js:91:20:91:28 | obj[path] | semmle.label | obj[path] |
 | lib.js:91:24:91:27 | path | semmle.label | path |
 | lib.js:92:3:92:12 | maybeProto | semmle.label | maybeProto |
 | lib.js:95:3:95:12 | maybeProto | semmle.label | maybeProto |
-| lib.js:104:7:104:24 | one | semmle.label | one |
+| lib.js:104:7:104:9 | one | semmle.label | one |
 | lib.js:104:13:104:21 | arguments | semmle.label | arguments |
 | lib.js:104:13:104:24 | arguments[1] | semmle.label | arguments[1] |
 | lib.js:108:3:108:10 | obj[one] | semmle.label | obj[one] |
@@ -221,7 +221,7 @@ nodes
 | sublib/sub.js:2:3:2:14 | obj[path[0]] | semmle.label | obj[path[0]] |
 | sublib/sub.js:2:7:2:10 | path | semmle.label | path |
 | sublib/sub.js:2:7:2:13 | path[0] | semmle.label | path[0] |
-| tst.js:5:9:5:38 | taint | semmle.label | taint |
+| tst.js:5:9:5:13 | taint | semmle.label | taint |
 | tst.js:5:17:5:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:5:24:5:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:8:5:8:17 | object[taint] | semmle.label | object[taint] |
@@ -241,7 +241,7 @@ nodes
 | tst.js:56:12:56:33 | obj ? o ...  : null | semmle.label | obj ? o ...  : null |
 | tst.js:56:18:56:26 | obj[prop] | semmle.label | obj[prop] |
 | tst.js:56:22:56:25 | prop | semmle.label | prop |
-| tst.js:77:9:77:38 | taint | semmle.label | taint |
+| tst.js:77:9:77:13 | taint | semmle.label | taint |
 | tst.js:77:17:77:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:77:24:77:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:80:5:80:17 | object[taint] | semmle.label | object[taint] |
@@ -257,7 +257,7 @@ nodes
 | tst.js:97:5:97:46 | obj[req ... g, '')] | semmle.label | obj[req ... g, '')] |
 | tst.js:97:9:97:19 | req.query.x | semmle.label | req.query.x |
 | tst.js:97:9:97:45 | req.que ... /g, '') | semmle.label | req.que ... /g, '') |
-| tst.js:102:9:102:38 | taint | semmle.label | taint |
+| tst.js:102:9:102:13 | taint | semmle.label | taint |
 | tst.js:102:17:102:38 | String( ... y.data) | semmle.label | String( ... y.data) |
 | tst.js:102:24:102:37 | req.query.data | semmle.label | req.query.data |
 | tst.js:105:5:105:17 | object[taint] | semmle.label | object[taint] |
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 4546ee4b6aab..7eb7c2fdf90a 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
@@ -61,42 +61,42 @@ edges
 | examples/PrototypePollutingFunction_fixed.js:5:29:5:36 | src[key] | examples/PrototypePollutingFunction_fixed.js:1:21:1:23 | src | provenance |  |
 | examples/PrototypePollutingFunction_fixed.js:7:24:7:26 | src | examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | provenance | Config |
 | examples/PrototypePollutingFunction_fixed.js:7:28:7:30 | key | examples/PrototypePollutingFunction_fixed.js:7:24:7:31 | src[key] | provenance | Config |
-| path-assignment.js:8:13:8:25 | key | path-assignment.js:13:29:13:31 | key | provenance |  |
-| path-assignment.js:8:13:8:25 | key | path-assignment.js:15:20:15:22 | key | provenance |  |
-| path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:8:13:8:25 | key | provenance |  |
-| path-assignment.js:13:13:13:32 | target | path-assignment.js:13:22:13:27 | target | provenance |  |
-| path-assignment.js:13:13:13:32 | target | path-assignment.js:15:13:15:18 | target | provenance |  |
+| path-assignment.js:8:13:8:15 | key | path-assignment.js:13:29:13:31 | key | provenance |  |
+| path-assignment.js:8:13:8:15 | key | path-assignment.js:15:20:15:22 | key | provenance |  |
+| path-assignment.js:8:19:8:25 | keys[i] | path-assignment.js:8:13:8:15 | key | provenance |  |
+| path-assignment.js:13:13:13:18 | target | path-assignment.js:13:22:13:27 | target | provenance |  |
+| path-assignment.js:13:13:13:18 | target | path-assignment.js:15:13:15:18 | target | provenance |  |
 | path-assignment.js:13:22:13:27 | target | path-assignment.js:13:22:13:32 | target[key] | provenance | Config |
-| path-assignment.js:13:22:13:32 | target[key] | path-assignment.js:13:13:13:32 | target | provenance |  |
+| path-assignment.js:13:22:13:32 | target[key] | path-assignment.js:13:13:13:18 | target | provenance |  |
 | path-assignment.js:13:29:13:31 | key | path-assignment.js:13:22:13:32 | target[key] | provenance | Config |
-| path-assignment.js:41:13:41:25 | key | path-assignment.js:42:25:42:27 | key | provenance |  |
-| path-assignment.js:41:13:41:25 | key | path-assignment.js:42:39:42:41 | key | provenance |  |
-| path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:41:13:41:25 | key | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:42:18:42:23 | target | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:42:32:42:37 | target | provenance |  |
-| path-assignment.js:42:9:42:48 | target | path-assignment.js:44:5:44:10 | target | provenance |  |
+| path-assignment.js:41:13:41:15 | key | path-assignment.js:42:25:42:27 | key | provenance |  |
+| path-assignment.js:41:13:41:15 | key | path-assignment.js:42:39:42:41 | key | provenance |  |
+| path-assignment.js:41:19:41:25 | keys[i] | path-assignment.js:41:13:41:15 | key | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:42:18:42:23 | target | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:42:32:42:37 | target | provenance |  |
+| path-assignment.js:42:9:42:14 | target | path-assignment.js:44:5:44:10 | target | provenance |  |
 | path-assignment.js:42:32:42:37 | target | path-assignment.js:42:32:42:42 | target[key] | provenance | Config |
-| path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:9:42:48 | target | provenance |  |
+| path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:9:42:14 | target | provenance |  |
 | path-assignment.js:42:32:42:42 | target[key] | path-assignment.js:42:32:42:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:42:39:42:41 | key | path-assignment.js:42:32:42:42 | target[key] | provenance | Config |
-| path-assignment.js:58:13:58:25 | key | path-assignment.js:59:25:59:27 | key | provenance |  |
-| path-assignment.js:58:13:58:25 | key | path-assignment.js:59:39:59:41 | key | provenance |  |
-| path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:58:13:58:25 | key | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:59:18:59:23 | target | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:59:32:59:37 | target | provenance |  |
-| path-assignment.js:59:9:59:48 | target | path-assignment.js:61:5:61:10 | target | provenance |  |
+| path-assignment.js:58:13:58:15 | key | path-assignment.js:59:25:59:27 | key | provenance |  |
+| path-assignment.js:58:13:58:15 | key | path-assignment.js:59:39:59:41 | key | provenance |  |
+| path-assignment.js:58:19:58:25 | keys[i] | path-assignment.js:58:13:58:15 | key | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:59:18:59:23 | target | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:59:32:59:37 | target | provenance |  |
+| path-assignment.js:59:9:59:14 | target | path-assignment.js:61:5:61:10 | target | provenance |  |
 | path-assignment.js:59:32:59:37 | target | path-assignment.js:59:32:59:42 | target[key] | provenance | Config |
-| path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:9:59:48 | target | provenance |  |
+| path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:9:59:14 | target | provenance |  |
 | path-assignment.js:59:32:59:42 | target[key] | path-assignment.js:59:32:59:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:59:39:59:41 | key | path-assignment.js:59:32:59:42 | target[key] | provenance | Config |
-| path-assignment.js:68:13:68:25 | key | path-assignment.js:69:25:69:27 | key | provenance |  |
-| path-assignment.js:68:13:68:25 | key | path-assignment.js:69:39:69:41 | key | provenance |  |
-| path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:68:13:68:25 | key | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:69:18:69:23 | target | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:69:32:69:37 | target | provenance |  |
-| path-assignment.js:69:9:69:48 | target | path-assignment.js:71:5:71:10 | target | provenance |  |
+| path-assignment.js:68:13:68:15 | key | path-assignment.js:69:25:69:27 | key | provenance |  |
+| path-assignment.js:68:13:68:15 | key | path-assignment.js:69:39:69:41 | key | provenance |  |
+| path-assignment.js:68:19:68:25 | keys[i] | path-assignment.js:68:13:68:15 | key | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:69:18:69:23 | target | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:69:32:69:37 | target | provenance |  |
+| path-assignment.js:69:9:69:14 | target | path-assignment.js:71:5:71:10 | target | provenance |  |
 | path-assignment.js:69:32:69:37 | target | path-assignment.js:69:32:69:42 | target[key] | provenance | Config |
-| path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:9:69:48 | target | provenance |  |
+| path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:9:69:14 | target | provenance |  |
 | path-assignment.js:69:32:69:42 | target[key] | path-assignment.js:69:32:69:48 | target[key] \|\| {} | provenance |  |
 | path-assignment.js:69:39:69:41 | key | path-assignment.js:69:32:69:42 | target[key] | provenance | Config |
 | tests.js:3:25:3:27 | dst | tests.js:6:28:6:30 | dst | provenance |  |
@@ -149,9 +149,9 @@ edges
 | tests.js:31:27:31:31 | value | tests.js:36:20:36:24 | value | provenance |  |
 | tests.js:31:34:31:36 | key | tests.js:32:24:32:26 | key | provenance |  |
 | tests.js:31:34:31:36 | key | tests.js:36:13:36:15 | key | provenance |  |
-| tests.js:32:9:32:27 | dstValue | tests.js:34:18:34:25 | dstValue | provenance |  |
+| tests.js:32:9:32:16 | dstValue | tests.js:34:18:34:25 | dstValue | provenance |  |
 | tests.js:32:20:32:22 | dst | tests.js:32:20:32:27 | dst[key] | provenance | Config |
-| tests.js:32:20:32:27 | dst[key] | tests.js:32:9:32:27 | dstValue | provenance |  |
+| tests.js:32:20:32:27 | dst[key] | tests.js:32:9:32:16 | dstValue | provenance |  |
 | tests.js:32:24:32:26 | key | tests.js:32:20:32:27 | dst[key] | provenance | Config |
 | tests.js:34:18:34:25 | dstValue | tests.js:23:19:23:21 | dst | provenance |  |
 | tests.js:34:28:34:32 | value | tests.js:23:27:23:33 | sources [0] | provenance |  |
@@ -274,11 +274,11 @@ edges
 | tests.js:189:32:189:34 | dst | tests.js:196:13:196:15 | dst | provenance |  |
 | tests.js:189:37:189:39 | src | tests.js:194:45:194:47 | src | provenance |  |
 | tests.js:189:37:189:39 | src | tests.js:196:24:196:26 | src | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:194:39:194:41 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:194:49:194:51 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:196:17:196:19 | key | provenance |  |
-| tests.js:192:13:192:25 | key | tests.js:196:28:196:30 | key | provenance |  |
-| tests.js:192:19:192:25 | keys[i] | tests.js:192:13:192:25 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:194:39:194:41 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:194:49:194:51 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:196:17:196:19 | key | provenance |  |
+| tests.js:192:13:192:15 | key | tests.js:196:28:196:30 | key | provenance |  |
+| tests.js:192:19:192:25 | keys[i] | tests.js:192:13:192:15 | key | provenance |  |
 | tests.js:194:35:194:37 | dst | tests.js:194:35:194:42 | dst[key] | provenance | Config |
 | tests.js:194:35:194:42 | dst[key] | tests.js:189:32:189:34 | dst | provenance |  |
 | tests.js:194:39:194:41 | key | tests.js:194:35:194:42 | dst[key] | provenance | Config |
@@ -329,11 +329,11 @@ edges
 | tests.js:240:41:240:43 | key | tests.js:240:36:240:44 | data[key] | provenance | Config |
 | tests.js:263:27:263:29 | dst | tests.js:268:30:268:32 | dst | provenance |  |
 | tests.js:263:27:263:29 | dst | tests.js:270:13:270:15 | dst | provenance |  |
-| tests.js:265:13:265:26 | key | tests.js:268:34:268:36 | key | provenance |  |
-| tests.js:265:13:265:26 | key | tests.js:270:17:270:19 | key | provenance |  |
-| tests.js:265:19:265:26 | entry[0] | tests.js:265:13:265:26 | key | provenance |  |
-| tests.js:266:13:266:28 | value | tests.js:270:24:270:28 | value | provenance |  |
-| tests.js:266:21:266:28 | entry[1] | tests.js:266:13:266:28 | value | provenance |  |
+| tests.js:265:13:265:15 | key | tests.js:268:34:268:36 | key | provenance |  |
+| tests.js:265:13:265:15 | key | tests.js:270:17:270:19 | key | provenance |  |
+| tests.js:265:19:265:26 | entry[0] | tests.js:265:13:265:15 | key | provenance |  |
+| tests.js:266:13:266:17 | value | tests.js:270:24:270:28 | value | provenance |  |
+| tests.js:266:21:266:28 | entry[1] | tests.js:266:13:266:17 | value | provenance |  |
 | tests.js:268:30:268:32 | dst | tests.js:268:30:268:37 | dst[key] | provenance | Config |
 | tests.js:268:30:268:37 | dst[key] | tests.js:263:27:263:29 | dst | provenance |  |
 | tests.js:268:34:268:36 | key | tests.js:268:30:268:37 | dst[key] | provenance | Config |
@@ -360,15 +360,15 @@ edges
 | tests.js:302:14:302:16 | key | tests.js:304:29:304:31 | key | provenance |  |
 | tests.js:302:14:302:16 | key | tests.js:306:38:306:40 | key | provenance |  |
 | tests.js:302:14:302:16 | key | tests.js:308:21:308:23 | key | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:306:44:306:48 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:306:44:306:48 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
-| tests.js:304:17:304:32 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:306:44:306:48 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:306:44:306:48 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
+| tests.js:304:17:304:21 | value | tests.js:308:28:308:32 | value | provenance |  |
 | tests.js:304:25:304:27 | src | tests.js:304:25:304:32 | src[key] | provenance | Config |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
-| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:32 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
+| tests.js:304:25:304:32 | src[key] | tests.js:304:17:304:21 | value | provenance |  |
 | tests.js:304:29:304:31 | key | tests.js:304:25:304:32 | src[key] | provenance | Config |
 | tests.js:304:29:304:31 | key | tests.js:304:25:304:32 | src[key] | provenance | Config |
 | tests.js:306:34:306:36 | dst | tests.js:306:34:306:41 | dst[key] | provenance | Config |
@@ -381,15 +381,15 @@ edges
 | tests.js:315:14:315:16 | key | tests.js:318:29:318:31 | key | provenance |  |
 | tests.js:315:14:315:16 | key | tests.js:320:42:320:44 | key | provenance |  |
 | tests.js:315:14:315:16 | key | tests.js:322:21:322:23 | key | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:320:48:320:52 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:320:48:320:52 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
-| tests.js:318:17:318:32 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:320:48:320:52 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:320:48:320:52 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
+| tests.js:318:17:318:21 | value | tests.js:322:28:322:32 | value | provenance |  |
 | tests.js:318:25:318:27 | src | tests.js:318:25:318:32 | src[key] | provenance | Config |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
-| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:32 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
+| tests.js:318:25:318:32 | src[key] | tests.js:318:17:318:21 | value | provenance |  |
 | tests.js:318:29:318:31 | key | tests.js:318:25:318:32 | src[key] | provenance | Config |
 | tests.js:318:29:318:31 | key | tests.js:318:25:318:32 | src[key] | provenance | Config |
 | tests.js:320:38:320:40 | dst | tests.js:320:38:320:45 | dst[key] | provenance | Config |
@@ -526,15 +526,15 @@ edges
 | tests.js:413:14:413:16 | key | tests.js:414:38:414:40 | key | provenance |  |
 | tests.js:413:14:413:16 | key | tests.js:415:39:415:41 | key | provenance |  |
 | tests.js:413:14:413:16 | key | tests.js:419:17:419:19 | key | provenance |  |
-| tests.js:414:13:414:41 | value | tests.js:417:42:417:46 | value | provenance |  |
-| tests.js:414:13:414:41 | value | tests.js:419:24:419:28 | value | provenance |  |
-| tests.js:414:21:414:41 | wrapped ... c, key) | tests.js:414:13:414:41 | value | provenance |  |
+| tests.js:414:13:414:17 | value | tests.js:417:42:417:46 | value | provenance |  |
+| tests.js:414:13:414:17 | value | tests.js:419:24:419:28 | value | provenance |  |
+| tests.js:414:21:414:41 | wrapped ... c, key) | tests.js:414:13:414:17 | value | provenance |  |
 | tests.js:414:33:414:35 | src | tests.js:408:22:408:24 | obj | provenance |  |
 | tests.js:414:33:414:35 | src | tests.js:414:21:414:41 | wrapped ... c, key) | provenance | Config |
 | tests.js:414:38:414:40 | key | tests.js:408:27:408:29 | key | provenance |  |
 | tests.js:414:38:414:40 | key | tests.js:414:21:414:41 | wrapped ... c, key) | provenance | Config |
-| tests.js:415:13:415:42 | target | tests.js:417:34:417:39 | target | provenance |  |
-| tests.js:415:22:415:42 | wrapped ... t, key) | tests.js:415:13:415:42 | target | provenance |  |
+| tests.js:415:13:415:18 | target | tests.js:417:34:417:39 | target | provenance |  |
+| tests.js:415:22:415:42 | wrapped ... t, key) | tests.js:415:13:415:18 | target | provenance |  |
 | tests.js:415:34:415:36 | dst | tests.js:408:22:408:24 | obj | provenance |  |
 | tests.js:415:34:415:36 | dst | tests.js:415:22:415:42 | wrapped ... t, key) | provenance | Config |
 | tests.js:415:39:415:41 | key | tests.js:408:27:408:29 | key | provenance |  |
@@ -551,15 +551,15 @@ edges
 | tests.js:430:14:430:16 | key | tests.js:431:41:431:43 | key | provenance |  |
 | tests.js:430:14:430:16 | key | tests.js:432:42:432:44 | key | provenance |  |
 | tests.js:430:14:430:16 | key | tests.js:436:17:436:19 | key | provenance |  |
-| tests.js:431:13:431:44 | value | tests.js:434:45:434:49 | value | provenance |  |
-| tests.js:431:13:431:44 | value | tests.js:436:24:436:28 | value | provenance |  |
-| tests.js:431:21:431:44 | almostS ... c, key) | tests.js:431:13:431:44 | value | provenance |  |
+| tests.js:431:13:431:17 | value | tests.js:434:45:434:49 | value | provenance |  |
+| tests.js:431:13:431:17 | value | tests.js:436:24:436:28 | value | provenance |  |
+| tests.js:431:21:431:44 | almostS ... c, key) | tests.js:431:13:431:17 | value | provenance |  |
 | tests.js:431:36:431:38 | src | tests.js:424:25:424:27 | obj | provenance |  |
 | tests.js:431:36:431:38 | src | tests.js:431:21:431:44 | almostS ... c, key) | provenance | Config |
 | tests.js:431:41:431:43 | key | tests.js:424:30:424:32 | key | provenance |  |
 | tests.js:431:41:431:43 | key | tests.js:431:21:431:44 | almostS ... c, key) | provenance | Config |
-| tests.js:432:13:432:45 | target | tests.js:434:37:434:42 | target | provenance |  |
-| tests.js:432:22:432:45 | almostS ... t, key) | tests.js:432:13:432:45 | target | provenance |  |
+| tests.js:432:13:432:18 | target | tests.js:434:37:434:42 | target | provenance |  |
+| tests.js:432:22:432:45 | almostS ... t, key) | tests.js:432:13:432:18 | target | provenance |  |
 | tests.js:432:37:432:39 | dst | tests.js:424:25:424:27 | obj | provenance |  |
 | tests.js:432:37:432:39 | dst | tests.js:432:22:432:45 | almostS ... t, key) | provenance | Config |
 | tests.js:432:42:432:44 | key | tests.js:424:30:424:32 | key | provenance |  |
@@ -570,9 +570,9 @@ edges
 | tests.js:443:12:443:14 | obj | tests.js:443:12:443:19 | obj[key] | provenance | Config |
 | tests.js:446:33:446:35 | src | tests.js:448:30:448:32 | src | provenance |  |
 | tests.js:447:14:447:16 | key | tests.js:453:17:453:19 | key | provenance |  |
-| tests.js:448:13:448:38 | value | tests.js:451:39:451:43 | value | provenance |  |
-| tests.js:448:13:448:38 | value | tests.js:453:24:453:28 | value | provenance |  |
-| tests.js:448:21:448:38 | safeRead(src, key) | tests.js:448:13:448:38 | value | provenance |  |
+| tests.js:448:13:448:17 | value | tests.js:451:39:451:43 | value | provenance |  |
+| tests.js:448:13:448:17 | value | tests.js:453:24:453:28 | value | provenance |  |
+| tests.js:448:21:448:38 | safeRead(src, key) | tests.js:448:13:448:17 | value | provenance |  |
 | tests.js:448:30:448:32 | src | tests.js:441:19:441:21 | obj | provenance |  |
 | tests.js:448:30:448:32 | src | tests.js:448:21:448:38 | safeRead(src, key) | provenance | Config |
 | tests.js:451:39:451:43 | value | tests.js:446:33:446:35 | src | provenance |  |
@@ -630,26 +630,26 @@ edges
 | tests.js:494:32:494:34 | src | tests.js:498:21:498:23 | src | provenance |  |
 | tests.js:495:14:495:16 | key | tests.js:498:25:498:27 | key | provenance |  |
 | tests.js:495:14:495:16 | key | tests.js:502:17:502:19 | key | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:500:38:500:42 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:500:38:500:42 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
-| tests.js:498:13:498:28 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:500:38:500:42 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:500:38:500:42 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
+| tests.js:498:13:498:17 | value | tests.js:502:24:502:28 | value | provenance |  |
 | tests.js:498:21:498:23 | src | tests.js:498:21:498:28 | src[key] | provenance | Config |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
-| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:28 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
+| tests.js:498:21:498:28 | src[key] | tests.js:498:13:498:17 | value | provenance |  |
 | tests.js:498:25:498:27 | key | tests.js:498:21:498:28 | src[key] | provenance | Config |
 | tests.js:500:38:500:42 | value | tests.js:494:32:494:34 | src | provenance |  |
 | tests.js:508:30:508:32 | dst | tests.js:513:33:513:35 | dst | provenance |  |
 | tests.js:508:30:508:32 | dst | tests.js:517:35:517:37 | dst | provenance |  |
 | tests.js:508:35:508:37 | src | tests.js:513:43:513:45 | src | provenance |  |
 | tests.js:508:35:508:37 | src | tests.js:516:32:516:34 | src | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:513:37:513:39 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:513:47:513:49 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:516:36:516:38 | key | provenance |  |
-| tests.js:511:13:511:25 | key | tests.js:517:40:517:42 | key | provenance |  |
-| tests.js:511:19:511:25 | keys[i] | tests.js:511:13:511:25 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:513:37:513:39 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:513:47:513:49 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:516:36:516:38 | key | provenance |  |
+| tests.js:511:13:511:15 | key | tests.js:517:40:517:42 | key | provenance |  |
+| tests.js:511:19:511:25 | keys[i] | tests.js:511:13:511:15 | key | provenance |  |
 | tests.js:513:33:513:35 | dst | tests.js:513:33:513:40 | dst[key] | provenance | Config |
 | tests.js:513:33:513:40 | dst[key] | tests.js:508:30:508:32 | dst | provenance |  |
 | tests.js:513:37:513:39 | key | tests.js:513:33:513:40 | dst[key] | provenance | Config |
@@ -660,14 +660,14 @@ edges
 | tests.js:516:36:516:38 | key | tests.js:516:32:516:39 | src[key] | provenance | Config |
 | tests.js:522:35:522:38 | args [0] | tests.js:523:17:523:20 | args [0] | provenance |  |
 | tests.js:522:35:522:38 | args [1] | tests.js:524:17:524:20 | args [1] | provenance |  |
-| tests.js:523:11:523:23 | dst | tests.js:527:35:527:37 | dst | provenance |  |
-| tests.js:523:11:523:23 | dst | tests.js:529:13:529:15 | dst | provenance |  |
+| tests.js:523:11:523:13 | dst | tests.js:527:35:527:37 | dst | provenance |  |
+| tests.js:523:11:523:13 | dst | tests.js:529:13:529:15 | dst | provenance |  |
 | tests.js:523:17:523:20 | args [0] | tests.js:523:17:523:23 | args[0] | provenance |  |
-| tests.js:523:17:523:23 | args[0] | tests.js:523:11:523:23 | dst | provenance |  |
-| tests.js:524:11:524:23 | src | tests.js:527:45:527:47 | src | provenance |  |
-| tests.js:524:11:524:23 | src | tests.js:529:24:529:26 | src | provenance |  |
+| tests.js:523:17:523:23 | args[0] | tests.js:523:11:523:13 | dst | provenance |  |
+| tests.js:524:11:524:13 | src | tests.js:527:45:527:47 | src | provenance |  |
+| tests.js:524:11:524:13 | src | tests.js:529:24:529:26 | src | provenance |  |
 | tests.js:524:17:524:20 | args [1] | tests.js:524:17:524:23 | args[1] | provenance |  |
-| tests.js:524:17:524:23 | args[1] | tests.js:524:11:524:23 | src | provenance |  |
+| tests.js:524:17:524:23 | args[1] | tests.js:524:11:524:13 | src | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:527:39:527:41 | key | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:527:49:527:51 | key | provenance |  |
 | tests.js:525:14:525:16 | key | tests.js:529:17:529:19 | key | provenance |  |
@@ -776,17 +776,17 @@ nodes
 | 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:13:8:15 | 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:13:13:18 | 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:13:41:15 | 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:9:42:14 | 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 |
@@ -795,9 +795,9 @@ nodes
 | 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:13:58:15 | 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:9:59:14 | 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 |
@@ -806,9 +806,9 @@ nodes
 | 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:13:68:15 | 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:9:69:14 | 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 |
@@ -859,7 +859,7 @@ nodes
 | 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:9:32:16 | 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 |
@@ -976,7 +976,7 @@ nodes
 | 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:13:192:15 | 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] |
@@ -1031,9 +1031,9 @@ nodes
 | 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:13:265:15 | 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:13:266:17 | 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] |
@@ -1059,9 +1059,9 @@ nodes
 | 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:17:304:21 | value | semmle.label | value |
+| tests.js:304:17:304:21 | value | semmle.label | value |
+| tests.js:304:17:304:21 | 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] |
@@ -1077,9 +1077,9 @@ nodes
 | 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:17:318:21 | value | semmle.label | value |
+| tests.js:318:17:318:21 | value | semmle.label | value |
+| tests.js:318:17:318:21 | 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] |
@@ -1197,11 +1197,11 @@ nodes
 | 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:13:414:17 | 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:13:415:18 | 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 |
@@ -1218,11 +1218,11 @@ nodes
 | 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:13:431:17 | 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:13:432:18 | 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 |
@@ -1236,7 +1236,7 @@ nodes
 | 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:13:448:17 | 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 |
@@ -1293,9 +1293,9 @@ nodes
 | 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:13:498:17 | value | semmle.label | value |
+| tests.js:498:13:498:17 | value | semmle.label | value |
+| tests.js:498:13:498:17 | 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] |
@@ -1306,7 +1306,7 @@ nodes
 | 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:13:511:15 | 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] |
@@ -1321,10 +1321,10 @@ nodes
 | 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:11:523:13 | 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:11:524:13 | 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 |
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 8b08f2a20afd..3bdb65ac4502 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
@@ -12,8 +12,8 @@ edges
 | 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:14:9:14:12 | 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:14:12 | 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 |  |
@@ -37,7 +37,7 @@ nodes
 | 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      ... 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:9:14:12 | 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      ... g\\n    } | semmle.label | {\\n      ... g\\n    } |
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 4a8f524f8624..1d6b8781db75 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/ClientSideRequestForgery.expected
@@ -4,32 +4,32 @@
 | 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:11:11:15 | 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 |  |
-| clientSide.js:11:19:11:53 | window. ... ring(1) | clientSide.js:11:11:11:53 | query | provenance |  |
+| clientSide.js:11:19:11:53 | window. ... ring(1) | clientSide.js:11:11:11:15 | query | provenance |  |
 | clientSide.js:12:42:12:46 | query | clientSide.js:12:13:12:54 | 'https: ... + '/id' | provenance |  |
 | clientSide.js:14:42:14:63 | window. ... .search | clientSide.js:14:13:14:63 | 'https: ... .search | provenance |  |
-| clientSide.js:16:11:16:54 | fragment | clientSide.js:17:42:17:49 | fragment | provenance |  |
+| clientSide.js:16:11:16:18 | fragment | clientSide.js:17:42:17:49 | fragment | provenance |  |
 | clientSide.js:16:22:16:41 | window.location.hash | clientSide.js:16:22:16:54 | window. ... ring(1) | provenance |  |
-| clientSide.js:16:22:16:54 | window. ... ring(1) | clientSide.js:16:11:16:54 | fragment | provenance |  |
+| clientSide.js:16:22:16:54 | window. ... ring(1) | clientSide.js:16:11:16:18 | fragment | provenance |  |
 | clientSide.js:17:42:17:49 | fragment | clientSide.js:17:13:17:57 | 'https: ... + '/id' | provenance |  |
-| clientSide.js:20:11:20:28 | name | clientSide.js:21:42:21:45 | name | provenance |  |
-| clientSide.js:20:18:20:28 | window.name | clientSide.js:20:11:20:28 | name | provenance |  |
+| clientSide.js:20:11:20:14 | name | clientSide.js:21:42:21:45 | name | provenance |  |
+| clientSide.js:20:18:20:28 | window.name | clientSide.js:20:11:20:14 | name | provenance |  |
 | clientSide.js:21:42:21:45 | name | clientSide.js:21:13:21:53 | 'https: ... + '/id' | provenance |  |
 nodes
-| clientSide.js:11:11:11:53 | query | semmle.label | query |
+| clientSide.js:11:11:11:15 | query | semmle.label | query |
 | clientSide.js:11:19:11:40 | window. ... .search | semmle.label | window. ... .search |
 | clientSide.js:11:19:11:53 | window. ... ring(1) | semmle.label | window. ... ring(1) |
 | clientSide.js:12:13:12:54 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:12:42:12:46 | query | semmle.label | query |
 | clientSide.js:14:13:14:63 | 'https: ... .search | semmle.label | 'https: ... .search |
 | clientSide.js:14:42:14:63 | window. ... .search | semmle.label | window. ... .search |
-| clientSide.js:16:11:16:54 | fragment | semmle.label | fragment |
+| clientSide.js:16:11:16:18 | fragment | semmle.label | fragment |
 | clientSide.js:16:22:16:41 | window.location.hash | semmle.label | window.location.hash |
 | clientSide.js:16:22:16:54 | window. ... ring(1) | semmle.label | window. ... ring(1) |
 | clientSide.js:17:13:17:57 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:17:42:17:49 | fragment | semmle.label | fragment |
-| clientSide.js:20:11:20:28 | name | semmle.label | name |
+| clientSide.js:20:11:20:14 | name | semmle.label | name |
 | clientSide.js:20:18:20:28 | window.name | semmle.label | window.name |
 | clientSide.js:21:13:21:53 | 'https: ... + '/id' | semmle.label | 'https: ... + '/id' |
 | clientSide.js:21:42:21:45 | name | semmle.label | name |
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 f7ff324b4018..a91a6348dfa6 100644
--- a/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
+++ b/javascript/ql/test/query-tests/Security/CWE-918/RequestForgery.expected
@@ -40,58 +40,58 @@
 | serverSide.js:145:3:145:23 | axios.g ... dedUrl) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:145:13:145:22 | encodedUrl | The $@ of this request depends on a $@. | serverSide.js:145:13:145:22 | encodedUrl | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
 | serverSide.js:147:3:147:23 | axios.g ... pedUrl) | serverSide.js:139:17:139:29 | req.query.url | serverSide.js:147:13:147:22 | escapedUrl | The $@ of this request depends on a $@. | serverSide.js:147:13:147:22 | escapedUrl | URL | serverSide.js:139:17:139:29 | req.query.url | user-provided value |
 edges
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | provenance |  |
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | provenance |  |
+| Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | provenance |  |
+| Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | provenance |  |
 | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | provenance |  |
 | Request/app/api/proxy/route2.serverSide.ts:4:25:4:34 | req.json() | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | provenance |  |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | provenance |  |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | provenance |  |
+| Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | provenance |  |
+| Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | provenance |  |
 | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | provenance |  |
 | Request/app/api/proxy/route.serverSide.ts:2:25:2:34 | req.json() | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | provenance |  |
-| Request/middleware.ts:4:11:4:30 | target | Request/middleware.ts:7:31:7:36 | target | provenance |  |
-| Request/middleware.ts:4:20:4:30 | req.nextUrl | Request/middleware.ts:4:11:4:30 | target | provenance |  |
-| Request/middleware.ts:5:11:5:53 | target2 | Request/middleware.ts:12:33:12:39 | target2 | provenance |  |
-| Request/middleware.ts:5:21:5:53 | target. ... arget') | Request/middleware.ts:5:11:5:53 | target2 | provenance |  |
-| 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 |  |
+| Request/middleware.ts:4:11:4:16 | target | Request/middleware.ts:7:31:7:36 | target | provenance |  |
+| Request/middleware.ts:4:20:4:30 | req.nextUrl | Request/middleware.ts:4:11:4:16 | target | provenance |  |
+| Request/middleware.ts:5:11:5:17 | target2 | Request/middleware.ts:12:33:12:39 | target2 | provenance |  |
+| Request/middleware.ts:5:21:5:53 | target. ... arget') | Request/middleware.ts:5:11:5:17 | target2 | provenance |  |
+| apollo.serverSide.ts:7:36:7:44 | { files } | apollo.serverSide.ts:7:38:7:42 | files | provenance |  |
+| apollo.serverSide.ts:7:38:7:42 | files | apollo.serverSide.ts:8:13:8:17 | 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 |  |
-| apollo.serverSide.ts:17:34:17:42 | files | apollo.serverSide.ts:18:11:18:15 | files | provenance |  |
-| apollo.serverSide.ts:17:34:17:42 | { files } | apollo.serverSide.ts:17:34:17:42 | files | provenance |  |
+| apollo.serverSide.ts:17:34:17:42 | { files } | apollo.serverSide.ts:17:36:17:40 | files | provenance |  |
+| apollo.serverSide.ts:17:36:17:40 | files | apollo.serverSide.ts:18:11:18:15 | files | provenance |  |
 | apollo.serverSide.ts:18:11:18:15 | files | apollo.serverSide.ts:18:26:18:29 | file | provenance |  |
 | apollo.serverSide.ts:18:26:18:29 | file | apollo.serverSide.ts:18:41:18:44 | file | provenance |  |
 | apollo.serverSide.ts:18:41:18:44 | file | apollo.serverSide.ts:18:41:18:48 | 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:11:19:17 | { url } | axiosInterceptors.serverSide.js:19:13:19:15 | url | provenance |  |
+| axiosInterceptors.serverSide.js:19:13:19:15 | 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 |  |
+| axiosInterceptors.serverSide.js:20:5:20:19 | userProvidedUrl | axiosInterceptors.serverSide.js:11:26:11:40 | userProvidedUrl | provenance |  |
+| axiosInterceptors.serverSide.js:20:23:20:25 | url | axiosInterceptors.serverSide.js:20:5:20:19 | userProvidedUrl | provenance |  |
 | serverSide2.js:9:34:9:63 | qs.pars ... .query) | serverSide2.js:19:24:19:51 | req.par ... rsedUrl | provenance |  |
 | serverSide2.js:9:43:9:56 | req._parsedUrl | serverSide2.js:9:34:9:63 | qs.pars ... .query) | provenance |  |
 | serverSide2.js:10:25:10:31 | req.url | serverSide2.js:16:23:16:41 | req.parsedQuery.url | provenance |  |
 | serverSide2.js:11:24:11:30 | req.url | serverSide2.js:25:24:25:41 | req.SomeObject.url | provenance |  |
-| serverSide2.js:16:11:16:41 | targetUrl | serverSide2.js:17:38:17:46 | targetUrl | provenance |  |
-| serverSide2.js:16:23:16:41 | req.parsedQuery.url | serverSide2.js:16:11:16:41 | targetUrl | provenance |  |
-| serverSide2.js:19:11:19:55 | targetUrl1 | serverSide2.js:20:39:20:48 | targetUrl1 | provenance |  |
-| serverSide2.js:19:24:19:51 | req.par ... rsedUrl | serverSide2.js:19:11:19:55 | targetUrl1 | provenance |  |
-| serverSide2.js:22:11:22:36 | targetUrl2 | serverSide2.js:23:39:23:48 | targetUrl2 | provenance |  |
-| serverSide2.js:22:24:22:30 | req.url | serverSide2.js:22:11:22:36 | targetUrl2 | provenance |  |
-| serverSide2.js:25:11:25:47 | targetUrl3 | serverSide2.js:26:39:26:48 | targetUrl3 | provenance |  |
-| serverSide2.js:25:24:25:41 | req.SomeObject.url | serverSide2.js:25:11:25:47 | targetUrl3 | 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 |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:26:25:26:31 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:28:36:28:42 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:30:37:30:43 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:34:34:34:40 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:36:24:36:30 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:37:30:37:36 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:41:43:41:49 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:43:46:43:52 | tainted | provenance |  |
-| serverSide.js:14:9:14:52 | tainted | serverSide.js:45:50:45:56 | tainted | provenance |  |
-| serverSide.js:14:19:14:42 | url.par ... , true) | serverSide.js:14:9:14:52 | tainted | provenance |  |
+| serverSide2.js:16:11:16:19 | targetUrl | serverSide2.js:17:38:17:46 | targetUrl | provenance |  |
+| serverSide2.js:16:23:16:41 | req.parsedQuery.url | serverSide2.js:16:11:16:19 | targetUrl | provenance |  |
+| serverSide2.js:19:11:19:20 | targetUrl1 | serverSide2.js:20:39:20:48 | targetUrl1 | provenance |  |
+| serverSide2.js:19:24:19:51 | req.par ... rsedUrl | serverSide2.js:19:11:19:20 | targetUrl1 | provenance |  |
+| serverSide2.js:22:11:22:20 | targetUrl2 | serverSide2.js:23:39:23:48 | targetUrl2 | provenance |  |
+| serverSide2.js:22:24:22:30 | req.url | serverSide2.js:22:11:22:20 | targetUrl2 | provenance |  |
+| serverSide2.js:25:11:25:20 | targetUrl3 | serverSide2.js:26:39:26:48 | targetUrl3 | provenance |  |
+| serverSide2.js:25:24:25:41 | req.SomeObject.url | serverSide2.js:25:11:25:20 | targetUrl3 | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:18:13:18:19 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:20:17:20:23 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:23:19:23:25 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:26:25:26:31 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:28:36:28:42 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:30:37:30:43 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:34:34:34:40 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:36:24:36:30 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:37:30:37:36 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:41:43:41:49 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:43:46:43:52 | tainted | provenance |  |
+| serverSide.js:14:9:14:15 | tainted | serverSide.js:45:50:45:56 | tainted | provenance |  |
+| serverSide.js:14:19:14:42 | url.par ... , true) | serverSide.js:14:9:14:15 | tainted | provenance |  |
 | serverSide.js:14:29:14:35 | req.url | serverSide.js:14:19:14:42 | url.par ... , true) | provenance |  |
 | serverSide.js:26:25:26:31 | tainted | serverSide.js:26:13:26:31 | "http://" + tainted | provenance |  |
 | serverSide.js:28:36:28:42 | tainted | serverSide.js:28:13:28:42 | "http:/ ... tainted | provenance |  |
@@ -101,101 +101,101 @@ edges
 | serverSide.js:41:43:41:49 | tainted | serverSide.js:41:13:41:51 | `http:/ ... inted}` | provenance |  |
 | serverSide.js:43:46:43:52 | tainted | serverSide.js:43:13:43:54 | `http:/ ... inted}` | provenance |  |
 | serverSide.js:45:50:45:56 | tainted | serverSide.js:45:13:45:56 | 'http:/ ... tainted | provenance |  |
-| serverSide.js:58:9:58:52 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
-| serverSide.js:58:9:58:52 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
-| serverSide.js:58:19:58:42 | url.par ... , true) | serverSide.js:58:9:58:52 | tainted | provenance |  |
+| serverSide.js:58:9:58:15 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
+| serverSide.js:58:9:58:15 | tainted | serverSide.js:61:29:61:35 | tainted | provenance |  |
+| serverSide.js:58:19:58:42 | url.par ... , true) | serverSide.js:58:9:58:15 | tainted | provenance |  |
 | serverSide.js:58:29:58:35 | req.url | serverSide.js:58:19:58:42 | url.par ... , true) | provenance |  |
 | serverSide.js:61:29:61:35 | tainted | serverSide.js:64:30:64:36 | tainted | provenance |  |
 | serverSide.js:61:29:61:35 | tainted | serverSide.js:68:30:68:36 | tainted | provenance |  |
-| serverSide.js:74:9:74:52 | tainted | serverSide.js:76:19:76:25 | tainted | provenance |  |
-| serverSide.js:74:19:74:42 | url.par ... , true) | serverSide.js:74:9:74:52 | tainted | provenance |  |
+| serverSide.js:74:9:74:15 | tainted | serverSide.js:76:19:76:25 | tainted | provenance |  |
+| serverSide.js:74:19:74:42 | url.par ... , true) | serverSide.js:74:9:74:15 | tainted | provenance |  |
 | serverSide.js:74:29:74:35 | req.url | serverSide.js:74:19:74:42 | url.par ... , true) | provenance |  |
 | serverSide.js:83:38:83:43 | param1 | serverSide.js:84:19:84:24 | param1 | provenance |  |
 | serverSide.js:90:19:90:28 | ctx.params | serverSide.js:90:19:90:32 | ctx.params.foo | provenance |  |
 | serverSide.js:92:19:92:28 | ctx.params | serverSide.js:92:19:92:32 | ctx.params.foo | provenance |  |
-| serverSide.js:98:9:98:52 | tainted | serverSide.js:100:19:100:25 | tainted | provenance |  |
-| serverSide.js:98:19:98:42 | url.par ... , true) | serverSide.js:98:9:98:52 | tainted | provenance |  |
+| serverSide.js:98:9:98:15 | tainted | serverSide.js:100:19:100:25 | tainted | provenance |  |
+| serverSide.js:98:19:98:42 | url.par ... , true) | serverSide.js:98:9:98:15 | tainted | provenance |  |
 | serverSide.js:98:29:98:35 | req.url | serverSide.js:98:19:98:42 | url.par ... , true) | provenance |  |
-| serverSide.js:108:11:108:27 | url | serverSide.js:109:27:109:29 | url | provenance |  |
-| serverSide.js:108:17:108:27 | request.url | serverSide.js:108:11:108:27 | url | provenance |  |
-| serverSide.js:115:11:115:42 | url | serverSide.js:117:27:117:29 | url | provenance |  |
-| serverSide.js:115:17:115:42 | new URL ... , base) | serverSide.js:115:11:115:42 | url | provenance |  |
+| serverSide.js:108:11:108:13 | url | serverSide.js:109:27:109:29 | url | provenance |  |
+| serverSide.js:108:17:108:27 | request.url | serverSide.js:108:11:108:13 | url | provenance |  |
+| serverSide.js:115:11:115:13 | url | serverSide.js:117:27:117:29 | url | provenance |  |
+| serverSide.js:115:17:115:42 | new URL ... , base) | serverSide.js:115:11:115:13 | url | provenance |  |
 | serverSide.js:115:25:115:35 | request.url | serverSide.js:115:17:115:42 | new URL ... , base) | provenance | Config |
-| serverSide.js:123:9:123:52 | tainted | serverSide.js:127:14:127:20 | tainted | provenance |  |
-| serverSide.js:123:9:123:52 | tainted | serverSide.js:130:37:130:43 | tainted | provenance |  |
-| serverSide.js:123:19:123:42 | url.par ... , true) | serverSide.js:123:9:123:52 | tainted | provenance |  |
+| serverSide.js:123:9:123:15 | tainted | serverSide.js:127:14:127:20 | tainted | provenance |  |
+| serverSide.js:123:9:123:15 | tainted | serverSide.js:130:37:130:43 | tainted | provenance |  |
+| serverSide.js:123:19:123:42 | url.par ... , true) | serverSide.js:123:9:123:15 | tainted | provenance |  |
 | serverSide.js:123:29:123:35 | req.url | serverSide.js:123:19:123:42 | url.par ... , true) | provenance |  |
-| 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 |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:140:26:140:30 | input | provenance |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:144:32:144:36 | input | provenance |  |
-| serverSide.js:139:9:139:29 | input | serverSide.js:146:29:146:33 | input | provenance |  |
-| serverSide.js:139:17:139:29 | req.query.url | serverSide.js:139:9:139:29 | input | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:141:13:141:18 | target | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:142:13:142:18 | target | provenance |  |
-| serverSide.js:140:9:140:31 | target | serverSide.js:143:13:143:18 | target | provenance |  |
-| serverSide.js:140:18:140:31 | new URL(input) | serverSide.js:140:9:140:31 | target | provenance |  |
+| serverSide.js:130:9:130:13 | myUrl | serverSide.js:131:15:131:19 | myUrl | provenance |  |
+| serverSide.js:130:37:130:43 | tainted | serverSide.js:130:9:130:13 | myUrl | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:140:26:140:30 | input | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:144:32:144:36 | input | provenance |  |
+| serverSide.js:139:9:139:13 | input | serverSide.js:146:29:146:33 | input | provenance |  |
+| serverSide.js:139:17:139:29 | req.query.url | serverSide.js:139:9:139:13 | input | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:141:13:141:18 | target | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:142:13:142:18 | target | provenance |  |
+| serverSide.js:140:9:140:14 | target | serverSide.js:143:13:143:18 | target | provenance |  |
+| serverSide.js:140:18:140:31 | new URL(input) | serverSide.js:140:9:140:14 | target | provenance |  |
 | serverSide.js:140:26:140:30 | input | serverSide.js:140:18:140:31 | new URL(input) | provenance | Config |
 | serverSide.js:141:13:141:18 | target | serverSide.js:141:13:141:29 | target.toString() | provenance |  |
 | serverSide.js:143:13:143:18 | target | serverSide.js:143:13:143:23 | target.href | provenance |  |
-| serverSide.js:144:9:144:37 | encodedUrl | serverSide.js:145:13:145:22 | encodedUrl | provenance |  |
-| serverSide.js:144:22:144:37 | encodeURI(input) | serverSide.js:144:9:144:37 | encodedUrl | provenance |  |
+| serverSide.js:144:9:144:18 | encodedUrl | serverSide.js:145:13:145:22 | encodedUrl | provenance |  |
+| serverSide.js:144:22:144:37 | encodeURI(input) | serverSide.js:144:9:144:18 | encodedUrl | provenance |  |
 | serverSide.js:144:32:144:36 | input | serverSide.js:144:22:144:37 | encodeURI(input) | provenance |  |
-| serverSide.js:146:9:146:34 | escapedUrl | serverSide.js:147:13:147:22 | escapedUrl | provenance |  |
-| serverSide.js:146:22:146:34 | escape(input) | serverSide.js:146:9:146:34 | escapedUrl | provenance |  |
+| serverSide.js:146:9:146:18 | escapedUrl | serverSide.js:147:13:147:22 | escapedUrl | provenance |  |
+| serverSide.js:146:22:146:34 | escape(input) | serverSide.js:146:9:146:18 | escapedUrl | provenance |  |
 | serverSide.js:146:29:146:33 | input | serverSide.js:146:22:146:34 | escape(input) | provenance |  |
 nodes
 | Request/app/api/proxy/route2.serverSide.ts:4:9:4:15 | { url } | semmle.label | { url } |
-| Request/app/api/proxy/route2.serverSide.ts:4:9:4:34 | url | semmle.label | url |
+| Request/app/api/proxy/route2.serverSide.ts:4:11:4:13 | url | semmle.label | url |
 | Request/app/api/proxy/route2.serverSide.ts:4:19:4:34 | await req.json() | semmle.label | await req.json() |
 | Request/app/api/proxy/route2.serverSide.ts:4:25:4:34 | req.json() | semmle.label | req.json() |
 | Request/app/api/proxy/route2.serverSide.ts:5:27:5:29 | url | semmle.label | url |
 | Request/app/api/proxy/route.serverSide.ts:2:9:2:15 | { url } | semmle.label | { url } |
-| Request/app/api/proxy/route.serverSide.ts:2:9:2:34 | url | semmle.label | url |
+| Request/app/api/proxy/route.serverSide.ts:2:11:2:13 | url | semmle.label | url |
 | Request/app/api/proxy/route.serverSide.ts:2:19:2:34 | await req.json() | semmle.label | await req.json() |
 | Request/app/api/proxy/route.serverSide.ts:2:25:2:34 | req.json() | semmle.label | req.json() |
 | Request/app/api/proxy/route.serverSide.ts:3:27:3:29 | url | semmle.label | url |
-| Request/middleware.ts:4:11:4:30 | target | semmle.label | target |
+| Request/middleware.ts:4:11:4:16 | target | semmle.label | target |
 | Request/middleware.ts:4:20:4:30 | req.nextUrl | semmle.label | req.nextUrl |
-| Request/middleware.ts:5:11:5:53 | target2 | semmle.label | target2 |
+| Request/middleware.ts:5:11:5:17 | target2 | semmle.label | target2 |
 | Request/middleware.ts:5:21:5:53 | target. ... arget') | semmle.label | target. ... arget') |
 | Request/middleware.ts:7:31:7:36 | target | semmle.label | target |
 | Request/middleware.ts:12:33:12:39 | target2 | semmle.label | target2 |
-| 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:7:38:7:42 | 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 |
-| apollo.serverSide.ts:17:34:17:42 | files | semmle.label | files |
 | apollo.serverSide.ts:17:34:17:42 | { files } | semmle.label | { files } |
+| apollo.serverSide.ts:17:36:17:40 | files | semmle.label | files |
 | apollo.serverSide.ts:18:11:18:15 | files | semmle.label | files |
 | apollo.serverSide.ts:18:26:18:29 | file | semmle.label | file |
 | apollo.serverSide.ts:18:41:18:44 | file | semmle.label | file |
 | apollo.serverSide.ts:18:41:18:48 | 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:13:19:15 | 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:5:20:19 | userProvidedUrl | semmle.label | userProvidedUrl |
 | axiosInterceptors.serverSide.js:20:23:20:25 | url | semmle.label | url |
 | serverSide2.js:9:34:9:63 | qs.pars ... .query) | semmle.label | qs.pars ... .query) |
 | serverSide2.js:9:43:9:56 | req._parsedUrl | semmle.label | req._parsedUrl |
 | serverSide2.js:10:25:10:31 | req.url | semmle.label | req.url |
 | serverSide2.js:11:24:11:30 | req.url | semmle.label | req.url |
-| serverSide2.js:16:11:16:41 | targetUrl | semmle.label | targetUrl |
+| serverSide2.js:16:11:16:19 | targetUrl | semmle.label | targetUrl |
 | serverSide2.js:16:23:16:41 | req.parsedQuery.url | semmle.label | req.parsedQuery.url |
 | serverSide2.js:17:38:17:46 | targetUrl | semmle.label | targetUrl |
-| serverSide2.js:19:11:19:55 | targetUrl1 | semmle.label | targetUrl1 |
+| serverSide2.js:19:11:19:20 | targetUrl1 | semmle.label | targetUrl1 |
 | serverSide2.js:19:24:19:51 | req.par ... rsedUrl | semmle.label | req.par ... rsedUrl |
 | serverSide2.js:20:39:20:48 | targetUrl1 | semmle.label | targetUrl1 |
-| serverSide2.js:22:11:22:36 | targetUrl2 | semmle.label | targetUrl2 |
+| serverSide2.js:22:11:22:20 | targetUrl2 | semmle.label | targetUrl2 |
 | serverSide2.js:22:24:22:30 | req.url | semmle.label | req.url |
 | serverSide2.js:23:39:23:48 | targetUrl2 | semmle.label | targetUrl2 |
-| serverSide2.js:25:11:25:47 | targetUrl3 | semmle.label | targetUrl3 |
+| serverSide2.js:25:11:25:20 | targetUrl3 | semmle.label | targetUrl3 |
 | serverSide2.js:25:24:25:41 | req.SomeObject.url | semmle.label | req.SomeObject.url |
 | serverSide2.js:26:39:26:48 | targetUrl3 | semmle.label | targetUrl3 |
-| serverSide.js:14:9:14:52 | tainted | semmle.label | tainted |
+| serverSide.js:14:9:14:15 | 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 |
 | serverSide.js:18:13:18:19 | tainted | semmle.label | tainted |
@@ -218,14 +218,14 @@ nodes
 | serverSide.js:43:46:43:52 | tainted | semmle.label | tainted |
 | serverSide.js:45:13:45:56 | 'http:/ ... tainted | semmle.label | 'http:/ ... tainted |
 | serverSide.js:45:50:45:56 | tainted | semmle.label | tainted |
-| serverSide.js:58:9:58:52 | tainted | semmle.label | tainted |
+| serverSide.js:58:9:58:15 | tainted | semmle.label | tainted |
 | serverSide.js:58:19:58:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:58:29:58:35 | req.url | semmle.label | req.url |
 | serverSide.js:61:29:61:35 | tainted | semmle.label | tainted |
 | serverSide.js:61:29:61:35 | tainted | semmle.label | tainted |
 | serverSide.js:64:30:64:36 | tainted | semmle.label | tainted |
 | serverSide.js:68:30:68:36 | tainted | semmle.label | tainted |
-| serverSide.js:74:9:74:52 | tainted | semmle.label | tainted |
+| serverSide.js:74:9:74:15 | tainted | semmle.label | tainted |
 | serverSide.js:74:19:74:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:74:29:74:35 | req.url | semmle.label | req.url |
 | serverSide.js:76:19:76:25 | tainted | semmle.label | tainted |
@@ -235,27 +235,27 @@ nodes
 | serverSide.js:90:19:90:32 | ctx.params.foo | semmle.label | ctx.params.foo |
 | serverSide.js:92:19:92:28 | ctx.params | semmle.label | ctx.params |
 | serverSide.js:92:19:92:32 | ctx.params.foo | semmle.label | ctx.params.foo |
-| serverSide.js:98:9:98:52 | tainted | semmle.label | tainted |
+| serverSide.js:98:9:98:15 | tainted | semmle.label | tainted |
 | serverSide.js:98:19:98:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:98:29:98:35 | req.url | semmle.label | req.url |
 | serverSide.js:100:19:100:25 | tainted | semmle.label | tainted |
-| serverSide.js:108:11:108:27 | url | semmle.label | url |
+| serverSide.js:108:11:108:13 | url | semmle.label | url |
 | serverSide.js:108:17:108:27 | request.url | semmle.label | request.url |
 | serverSide.js:109:27:109:29 | url | semmle.label | url |
-| serverSide.js:115:11:115:42 | url | semmle.label | url |
+| serverSide.js:115:11:115:13 | url | semmle.label | url |
 | serverSide.js:115:17:115:42 | new URL ... , base) | semmle.label | new URL ... , base) |
 | serverSide.js:115:25:115:35 | request.url | semmle.label | request.url |
 | serverSide.js:117:27:117:29 | url | semmle.label | url |
-| serverSide.js:123:9:123:52 | tainted | semmle.label | tainted |
+| serverSide.js:123:9:123:15 | tainted | semmle.label | tainted |
 | serverSide.js:123:19:123:42 | url.par ... , true) | semmle.label | url.par ... , true) |
 | serverSide.js:123:29:123:35 | req.url | semmle.label | req.url |
 | serverSide.js:127:14:127:20 | tainted | semmle.label | tainted |
-| serverSide.js:130:9:130:45 | myUrl | semmle.label | myUrl |
+| serverSide.js:130:9:130:13 | myUrl | semmle.label | myUrl |
 | serverSide.js:130:37:130:43 | tainted | semmle.label | tainted |
 | serverSide.js:131:15:131:19 | myUrl | semmle.label | myUrl |
-| serverSide.js:139:9:139:29 | input | semmle.label | input |
+| serverSide.js:139:9:139:13 | input | semmle.label | input |
 | serverSide.js:139:17:139:29 | req.query.url | semmle.label | req.query.url |
-| serverSide.js:140:9:140:31 | target | semmle.label | target |
+| serverSide.js:140:9:140:14 | target | semmle.label | target |
 | serverSide.js:140:18:140:31 | new URL(input) | semmle.label | new URL(input) |
 | serverSide.js:140:26:140:30 | input | semmle.label | input |
 | serverSide.js:141:13:141:18 | target | semmle.label | target |
@@ -263,11 +263,11 @@ nodes
 | serverSide.js:142:13:142:18 | target | semmle.label | target |
 | serverSide.js:143:13:143:18 | target | semmle.label | target |
 | serverSide.js:143:13:143:23 | target.href | semmle.label | target.href |
-| serverSide.js:144:9:144:37 | encodedUrl | semmle.label | encodedUrl |
+| serverSide.js:144:9:144:18 | encodedUrl | semmle.label | encodedUrl |
 | serverSide.js:144:22:144:37 | encodeURI(input) | semmle.label | encodeURI(input) |
 | serverSide.js:144:32:144:36 | input | semmle.label | input |
 | serverSide.js:145:13:145:22 | encodedUrl | semmle.label | encodedUrl |
-| serverSide.js:146:9:146:34 | escapedUrl | semmle.label | escapedUrl |
+| serverSide.js:146:9:146:18 | escapedUrl | semmle.label | escapedUrl |
 | serverSide.js:146:22:146:34 | escape(input) | semmle.label | escape(input) |
 | serverSide.js:146:29:146:33 | input | semmle.label | input |
 | serverSide.js:147:13:147:22 | escapedUrl | semmle.label | escapedUrl |
diff --git a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected
index 42bfa5e64308..fef71929fdff 100644
--- a/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected	
+++ b/javascript/ql/test/tutorials/Analyzing data flow in JavaScript/Local data flow/query1.expected	
@@ -1,3 +1,3 @@
-| test.js:4:5:4:22 | firstArg |
+| test.js:4:5:4:12 | firstArg |
 | test.js:4:16:4:22 | args[2] |
 | test.js:5:13:5:20 | firstArg |
diff --git a/javascript/resources/codeql-extractor.yml b/javascript/resources/codeql-extractor.yml
index b82b2a965811..14ec56e2429d 100644
--- a/javascript/resources/codeql-extractor.yml
+++ b/javascript/resources/codeql-extractor.yml
@@ -6,8 +6,11 @@ display_name: "JavaScript/TypeScript"
 version: 1.22.1
 column_kind: "utf16"
 unicode_newlines: true
+overlay_support_version: 20250626
 build_modes:
   - none
+default_queries:
+  - codeql/javascript-queries
 file_coverage_languages:
   - name: javascript
     display_name: JavaScript
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.19.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.18.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstream-0.6.19.bazel
index f4323de097a5..efabc537139c 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.19.bazel
@@ -93,23 +93,23 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.6.18",
+    version = "0.6.19",
     deps = [
-        "@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__anstyle-1.0.11//:anstyle",
+        "@vendor_ts__anstyle-parse-0.2.7//:anstyle_parse",
+        "@vendor_ts__anstyle-query-1.1.3//:anstyle_query",
+        "@vendor_ts__colorchoice-1.0.4//: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_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # aarch64-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.9//:anstyle_wincon",  # aarch64-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # i686-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.9//:anstyle_wincon",  # i686-pc-windows-msvc
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__anstyle-wincon-3.0.7//:anstyle_wincon",  # x86_64-pc-windows-msvc
+            "@vendor_ts__anstyle-wincon-3.0.9//:anstyle_wincon",  # x86_64-pc-windows-msvc
         ],
         "//conditions:default": [],
     }),
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
index 3edab30a739d..0680166780b6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.10.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-1.0.11.bazel
@@ -92,5 +92,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.10",
+    version = "1.0.11",
 )
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.7.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.6.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-parse-0.2.7.bazel
index 76bd33a1a87c..ac933291b6a3 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.7.bazel
@@ -92,7 +92,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.6",
+    version = "0.2.7",
     deps = [
         "@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.3.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-query-1.1.3.bazel
index 3726dd1b1b6e..04bdb7d55361 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.3.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.1.2",
+    version = "1.1.3",
     deps = select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
             "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
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.9.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anstyle-wincon-3.0.9.bazel
index 4665ce20e48e..acb0616902e3 100644
--- 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.9.bazel
@@ -88,20 +88,20 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.0.7",
+    version = "3.0.9",
     deps = [
-        "@vendor_ts__anstyle-1.0.10//:anstyle",
+        "@vendor_ts__anstyle-1.0.11//:anstyle",
     ] + select({
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__once_cell-1.20.3//:once_cell",  # cfg(windows)
+            "@vendor_ts__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # 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__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # 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__once_cell_polyfill-1.70.1//:once_cell_polyfill",  # 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.98.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.99.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.98.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.99.bazel
index daa523a6b66c..cdcb7d554a24 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.98.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.anyhow-1.0.99.bazel
@@ -96,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.98",
+    version = "1.0.99",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:build_script_build",
+        "@vendor_ts__anyhow-1.0.99//:build_script_build",
     ],
 )
 
@@ -154,7 +154,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.98",
+    version = "1.0.99",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
index 426ee88b2fec..66631184b2fd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.4.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.autocfg-1.5.0.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.4.0",
+    version = "1.5.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
index 8b09c0613aae..df61c70b2497 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bazel
@@ -32,14 +32,14 @@ filegroup(
 
 # Workspace Member Dependencies
 alias(
-    name = "anyhow-1.0.98",
-    actual = "@vendor_ts__anyhow-1.0.98//:anyhow",
+    name = "anyhow-1.0.99",
+    actual = "@vendor_ts__anyhow-1.0.99//:anyhow",
     tags = ["manual"],
 )
 
 alias(
     name = "anyhow",
-    actual = "@vendor_ts__anyhow-1.0.98//:anyhow",
+    actual = "@vendor_ts__anyhow-1.0.99//:anyhow",
     tags = ["manual"],
 )
 
@@ -56,14 +56,14 @@ alias(
 )
 
 alias(
-    name = "chalk-ir-0.103.0",
-    actual = "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
+    name = "chalk-ir-0.104.0",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
     tags = ["manual"],
 )
 
 alias(
     name = "chalk-ir",
-    actual = "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
+    actual = "@vendor_ts__chalk-ir-0.104.0//:chalk_ir",
     tags = ["manual"],
 )
 
@@ -80,14 +80,14 @@ alias(
 )
 
 alias(
-    name = "clap-4.5.40",
-    actual = "@vendor_ts__clap-4.5.40//:clap",
+    name = "clap-4.5.44",
+    actual = "@vendor_ts__clap-4.5.44//:clap",
     tags = ["manual"],
 )
 
 alias(
     name = "clap",
-    actual = "@vendor_ts__clap-4.5.40//:clap",
+    actual = "@vendor_ts__clap-4.5.44//:clap",
     tags = ["manual"],
 )
 
@@ -152,14 +152,14 @@ alias(
 )
 
 alias(
-    name = "glob-0.3.2",
-    actual = "@vendor_ts__glob-0.3.2//:glob",
+    name = "glob-0.3.3",
+    actual = "@vendor_ts__glob-0.3.3//:glob",
     tags = ["manual"],
 )
 
 alias(
     name = "glob",
-    actual = "@vendor_ts__glob-0.3.2//:glob",
+    actual = "@vendor_ts__glob-0.3.3//:glob",
     tags = ["manual"],
 )
 
@@ -236,14 +236,14 @@ alias(
 )
 
 alias(
-    name = "proc-macro2-1.0.95",
-    actual = "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+    name = "proc-macro2-1.0.97",
+    actual = "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
     tags = ["manual"],
 )
 
 alias(
     name = "proc-macro2",
-    actual = "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+    actual = "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
     tags = ["manual"],
 )
 
@@ -260,212 +260,212 @@ alias(
 )
 
 alias(
-    name = "ra_ap_base_db-0.0.288",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
+    name = "ra_ap_base_db-0.0.300",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_base_db",
-    actual = "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
+    actual = "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_cfg-0.0.288",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
+    name = "ra_ap_cfg-0.0.300",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_cfg",
-    actual = "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
+    actual = "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
+    name = "ra_ap_hir-0.0.300",
+    actual = "@vendor_ts__ra_ap_hir-0.0.300//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir",
-    actual = "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
+    actual = "@vendor_ts__ra_ap_hir-0.0.300//:ra_ap_hir",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_def-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
+    name = "ra_ap_hir_def-0.0.300",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_def",
-    actual = "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
+    actual = "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_expand-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
+    name = "ra_ap_hir_expand-0.0.300",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_expand",
-    actual = "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
+    actual = "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_hir_ty-0.0.288",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
+    name = "ra_ap_hir_ty-0.0.300",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.300//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_hir_ty",
-    actual = "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
+    actual = "@vendor_ts__ra_ap_hir_ty-0.0.300//:ra_ap_hir_ty",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_ide_db-0.0.288",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
+    name = "ra_ap_ide_db-0.0.300",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.300//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_ide_db",
-    actual = "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
+    actual = "@vendor_ts__ra_ap_ide_db-0.0.300//:ra_ap_ide_db",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_intern-0.0.288",
-    actual = "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
+    name = "ra_ap_intern-0.0.300",
+    actual = "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_intern",
-    actual = "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
+    actual = "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_load-cargo-0.0.288",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo",
+    name = "ra_ap_load-cargo-0.0.300",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.300//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_load-cargo",
-    actual = "@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo",
+    actual = "@vendor_ts__ra_ap_load-cargo-0.0.300//:ra_ap_load_cargo",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_parser-0.0.288",
-    actual = "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
+    name = "ra_ap_parser-0.0.300",
+    actual = "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_parser",
-    actual = "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
+    actual = "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_paths-0.0.288",
-    actual = "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
+    name = "ra_ap_paths-0.0.300",
+    actual = "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_paths",
-    actual = "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
+    actual = "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_project_model-0.0.288",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
+    name = "ra_ap_project_model-0.0.300",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.300//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_project_model",
-    actual = "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
+    actual = "@vendor_ts__ra_ap_project_model-0.0.300//:ra_ap_project_model",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_span-0.0.288",
-    actual = "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
+    name = "ra_ap_span-0.0.300",
+    actual = "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_span",
-    actual = "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
+    actual = "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_stdx-0.0.288",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    name = "ra_ap_stdx-0.0.300",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "stdx-0.0.288",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    name = "stdx-0.0.300",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
     name = "stdx",
-    actual = "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+    actual = "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_syntax-0.0.288",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+    name = "ra_ap_syntax-0.0.300",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_syntax",
-    actual = "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+    actual = "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
     tags = ["manual"],
 )
 
 alias(
-    name = "ra_ap_vfs-0.0.288",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+    name = "ra_ap_vfs-0.0.300",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
     name = "ra_ap_vfs",
-    actual = "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+    actual = "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
     tags = ["manual"],
 )
 
 alias(
-    name = "rand-0.9.1",
-    actual = "@vendor_ts__rand-0.9.1//:rand",
+    name = "rand-0.9.2",
+    actual = "@vendor_ts__rand-0.9.2//:rand",
     tags = ["manual"],
 )
 
 alias(
     name = "rand",
-    actual = "@vendor_ts__rand-0.9.1//:rand",
+    actual = "@vendor_ts__rand-0.9.2//:rand",
     tags = ["manual"],
 )
 
@@ -506,50 +506,50 @@ alias(
 )
 
 alias(
-    name = "serde_json-1.0.140",
-    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
+    name = "serde_json-1.0.142",
+    actual = "@vendor_ts__serde_json-1.0.142//:serde_json",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_json",
-    actual = "@vendor_ts__serde_json-1.0.140//:serde_json",
+    actual = "@vendor_ts__serde_json-1.0.142//:serde_json",
     tags = ["manual"],
 )
 
 alias(
-    name = "serde_with-3.13.0",
-    actual = "@vendor_ts__serde_with-3.13.0//:serde_with",
+    name = "serde_with-3.14.0",
+    actual = "@vendor_ts__serde_with-3.14.0//:serde_with",
     tags = ["manual"],
 )
 
 alias(
     name = "serde_with",
-    actual = "@vendor_ts__serde_with-3.13.0//:serde_with",
+    actual = "@vendor_ts__serde_with-3.14.0//:serde_with",
     tags = ["manual"],
 )
 
 alias(
-    name = "syn-2.0.103",
-    actual = "@vendor_ts__syn-2.0.103//:syn",
+    name = "syn-2.0.104",
+    actual = "@vendor_ts__syn-2.0.104//:syn",
     tags = ["manual"],
 )
 
 alias(
     name = "syn",
-    actual = "@vendor_ts__syn-2.0.103//:syn",
+    actual = "@vendor_ts__syn-2.0.104//:syn",
     tags = ["manual"],
 )
 
 alias(
-    name = "toml-0.8.23",
-    actual = "@vendor_ts__toml-0.8.23//:toml",
+    name = "toml-0.9.5",
+    actual = "@vendor_ts__toml-0.9.5//:toml",
     tags = ["manual"],
 )
 
 alias(
     name = "toml",
-    actual = "@vendor_ts__toml-0.8.23//:toml",
+    actual = "@vendor_ts__toml-0.9.5//:toml",
     tags = ["manual"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
index 144c4990caf4..f1cef840bb80 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.borsh-1.5.7.bazel
@@ -92,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.5.5",
+    version = "1.5.7",
     deps = [
-        "@vendor_ts__borsh-1.5.5//:build_script_build",
+        "@vendor_ts__borsh-1.5.7//:build_script_build",
     ],
 )
 
@@ -146,7 +146,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.5.5",
+    version = "1.5.7",
     visibility = ["//visibility:private"],
     deps = [
         "@vendor_ts__cfg_aliases-0.2.1//:cfg_aliases",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
index 4a816613e623..8b8e72859900 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.16.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.bumpalo-3.19.0.bazel
@@ -91,5 +91,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.16.0",
+    version = "3.19.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
index dc20343396fc..a4d476d9ad99 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.2.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo-util-schemas-0.8.2.bazel
@@ -88,13 +88,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.0",
+    version = "0.8.2",
     deps = [
         "@vendor_ts__semver-1.0.26//:semver",
         "@vendor_ts__serde-1.0.219//:serde",
         "@vendor_ts__serde-untagged-0.1.7//:serde_untagged",
         "@vendor_ts__serde-value-0.7.0//:serde_value",
-        "@vendor_ts__thiserror-1.0.69//:thiserror",
+        "@vendor_ts__thiserror-2.0.12//:thiserror",
         "@vendor_ts__toml-0.8.23//:toml",
         "@vendor_ts__unicode-xid-0.2.6//:unicode_xid",
         "@vendor_ts__url-2.5.4//:url",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
index 8e20620f1d79..37ecc0be0e08 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.20.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cargo_metadata-0.21.0.bazel
@@ -91,14 +91,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.0",
+    version = "0.21.0",
     deps = [
         "@vendor_ts__camino-1.1.10//:camino",
         "@vendor_ts__cargo-platform-0.2.0//:cargo_platform",
-        "@vendor_ts__cargo-util-schemas-0.2.0//:cargo_util_schemas",
+        "@vendor_ts__cargo-util-schemas-0.8.2//:cargo_util_schemas",
         "@vendor_ts__semver-1.0.26//:semver",
         "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde_json-1.0.142//:serde_json",
         "@vendor_ts__thiserror-2.0.12//: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.29.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.7.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.cc-1.2.29.bazel
index f49b2a00f16c..94f1085dc752 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.29.bazel
@@ -91,7 +91,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.2.7",
+    version = "1.2.29",
     deps = [
         "@vendor_ts__jobserver-0.1.32//:jobserver",
         "@vendor_ts__shlex-1.3.0//:shlex",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
index 26bb8d267a73..43156f3cd950 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.103.0.bazel
@@ -90,9 +90,9 @@ rust_proc_macro(
     }),
     version = "0.103.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.bazel
new file mode 100644
index 000000000000..b37413cd6c08
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-derive-0.104.0.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.104.0",
+    deps = [
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
+        "@vendor_ts__quote-1.0.40//:quote",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.bazel
new file mode 100644
index 000000000000..16b835996d69
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-ir-0.104.0.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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.104.0//:chalk_derive",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.104.0",
+    deps = [
+        "@vendor_ts__bitflags-2.9.1//:bitflags",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
index 44923a124e59..4966053d4f36 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chalk-solve-0.103.0.bazel
@@ -95,7 +95,7 @@ rust_library(
     deps = [
         "@vendor_ts__chalk-ir-0.103.0//:chalk_ir",
         "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.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",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel
index 42801a73f910..c96eee266690 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.chrono-0.4.41.bazel
@@ -110,93 +110,93 @@ rust_library(
         "@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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__windows-link-0.1.3//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__windows-link-0.1.3//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__js-sys-0.3.77//:js_sys",  # wasm32-unknown-unknown
+            "@vendor_ts__wasm-bindgen-0.2.100//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__windows-link-0.1.3//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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
+            "@vendor_ts__iana-time-zone-0.1.63//: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.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.44.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.44.bazel
index e055432baeeb..df9619c99eaf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap-4.5.44.bazel
@@ -47,7 +47,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__clap_derive-4.5.40//:clap_derive",
+        "@vendor_ts__clap_derive-4.5.41//:clap_derive",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -101,8 +101,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.44",
     deps = [
-        "@vendor_ts__clap_builder-4.5.40//:clap_builder",
+        "@vendor_ts__clap_builder-4.5.44//:clap_builder",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.44.bazel
similarity index 95%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.44.bazel
index e0f318dadde0..639d48d46379 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_builder-4.5.44.bazel
@@ -96,11 +96,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.44",
     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__anstream-0.6.19//:anstream",
+        "@vendor_ts__anstyle-1.0.11//:anstyle",
+        "@vendor_ts__clap_lex-0.7.5//:clap_lex",
         "@vendor_ts__strsim-0.11.1//:strsim",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.41.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.41.bazel
index ebc392a70a86..177f948947f5 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.40.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_derive-4.5.41.bazel
@@ -91,11 +91,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "4.5.40",
+    version = "4.5.41",
     deps = [
         "@vendor_ts__heck-0.5.0//:heck",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
index 51aeb39bd7f0..1762f5e85149 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.4.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.clap_lex-0.7.5.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.4",
+    version = "0.7.5",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
index 316964883374..19f14814c6bd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.3.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.colorchoice-1.0.4.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.3",
+    version = "1.0.4",
 )
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.11.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling-0.20.11.bazel
index 4efdc5f31088..57a23dfb80e4 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.11.bazel
@@ -41,7 +41,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__darling_macro-0.20.10//:darling_macro",
+        "@vendor_ts__darling_macro-0.20.11//:darling_macro",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -95,8 +95,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.20.11",
     deps = [
-        "@vendor_ts__darling_core-0.20.10//:darling_core",
+        "@vendor_ts__darling_core-0.20.11//: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.11.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_core-0.20.11.bazel
index 2513d906b8fb..3f33e24ebe29 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.11.bazel
@@ -92,13 +92,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.20.11",
     deps = [
         "@vendor_ts__fnv-1.0.7//:fnv",
         "@vendor_ts__ident_case-1.0.1//:ident_case",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
         "@vendor_ts__strsim-0.11.1//:strsim",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//: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.11.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.darling_macro-0.20.11.bazel
index 0d48c6352843..f4d01d9198e9 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.11.bazel
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.20.10",
+    version = "0.20.11",
     deps = [
-        "@vendor_ts__darling_core-0.20.10//:darling_core",
+        "@vendor_ts__darling_core-0.20.11//:darling_core",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
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
index e902b52fc776..e4f933a3d510 100644
--- 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
@@ -97,8 +97,8 @@ rust_library(
         "@vendor_ts__cfg-if-1.0.1//: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",
+        "@vendor_ts__lock_api-0.4.13//:lock_api",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__parking_lot_core-0.9.11//:parking_lot_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.4.0.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.4.0.bazel
index ae6823440923..c25fab4a1ad3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.3.11.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.deranged-0.4.0.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.11",
+    version = "0.4.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
index d2be9ea8eb78..7c6b8f96bbf6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.displaydoc-0.2.5.bazel
@@ -90,8 +90,8 @@ rust_proc_macro(
     }),
     version = "0.2.5",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
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 15c2e43a80fa..ae8912b43404 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
@@ -149,7 +149,7 @@ cargo_build_script(
     version = "2.11.0",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
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.3.bazel
similarity index 74%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.getrandom-0.3.3.bazel
index 24c7f564c523..54516ab2d7a6 100644
--- 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.3.bazel
@@ -95,10 +95,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.1",
+    version = "0.3.3",
     deps = [
         "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__getrandom-0.3.1//:build_script_build",
+        "@vendor_ts__getrandom-0.3.3//:build_script_build",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
@@ -110,49 +110,43 @@ rust_library(
             "@vendor_ts__libc-0.2.174//: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.174//: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")))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
             "@vendor_ts__libc-0.2.174//: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.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
             "@vendor_ts__libc-0.2.174//: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.174//: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")))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
         ],
         "@rules_rust//rust/platform:i686-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "macos", target_os = "openbsd", target_os = "vita", target_os = "emscripten"))
@@ -161,19 +155,16 @@ rust_library(
             "@vendor_ts__libc-0.2.174//: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.174//: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")))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-freebsd": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", all(target_os = "horizon", target_arch = "arm")))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(any(target_os = "dragonfly", target_os = "freebsd", target_os = "hurd", target_os = "illumos", target_os = "cygwin", all(target_os = "horizon", target_arch = "arm")))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
-            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(getrandom_backend = "custom", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
+            "@vendor_ts__libc-0.2.174//:libc",  # cfg(all(any(target_os = "linux", target_os = "android"), not(any(all(target_os = "linux", target_env = ""), getrandom_backend = "custom", getrandom_backend = "linux_raw", getrandom_backend = "rdrand", getrandom_backend = "rndr"))))
         ],
         "//conditions:default": [],
     }),
@@ -230,7 +221,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.3.1",
+    version = "0.3.3",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
index 8b0a41ca41fe..da1a76791096 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.glob-0.3.3.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.2",
+    version = "0.3.3",
 )
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.4.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.hashbrown-0.15.4.bazel
index 73f285ddc427..e787c0b73f36 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.4.bazel
@@ -96,7 +96,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.15.2",
+    version = "0.15.4",
     deps = [
         "@vendor_ts__allocator-api2-0.2.21//:allocator_api2",
         "@vendor_ts__equivalent-1.0.2//:equivalent",
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
index 77d4a570d124..cede17426a82 100644
--- 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
@@ -90,6 +90,6 @@ rust_library(
     }),
     version = "0.10.0",
     deps = [
-        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__hashbrown-0.15.4//:hashbrown",
     ],
 )
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.63.bazel
similarity index 87%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.61.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.iana-time-zone-0.1.63.bazel
index 04cb0e6a4e6a..19f174690010 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.63.bazel
@@ -38,7 +38,7 @@ rust_library(
         "fallback",
     ],
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -91,50 +91,51 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.61",
+    version = "0.1.63",
     deps = select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-apple-ios-sim": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:aarch64-linux-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_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:armv7-linux-androideabi": [
             "@vendor_ts__android_system_properties-0.1.5//:android_system_properties",  # cfg(target_os = "android")
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:i686-linux-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_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//:windows_core",  # cfg(target_os = "windows")
         ],
         "@rules_rust//rust/platform:wasm32-unknown-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"))
+            "@vendor_ts__js-sys-0.3.77//:js_sys",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__log-0.4.27//:log",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
+            "@vendor_ts__wasm-bindgen-0.2.100//:wasm_bindgen",  # cfg(all(target_arch = "wasm32", target_os = "unknown"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:x86_64-apple-ios": [
-            "@vendor_ts__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(target_vendor = "apple")
         ],
         "@rules_rust//rust/platform:x86_64-linux-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_ts__windows-core-0.52.0//:windows_core",  # cfg(target_os = "windows")
+            "@vendor_ts__windows-core-0.61.2//: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 b41fc811758f..ac8feaf79a27 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
@@ -149,7 +149,7 @@ cargo_build_script(
     version = "0.1.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//: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 a529a3ed814d..9af800b92dcf 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
@@ -150,7 +150,7 @@ cargo_build_script(
     version = "1.9.3",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.10.0.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.10.0.bazel
index 3016429fb5e7..110e79e3f128 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.indexmap-2.10.0.bazel
@@ -93,10 +93,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.9.0",
+    version = "2.10.0",
     deps = [
         "@vendor_ts__equivalent-1.0.2//:equivalent",
-        "@vendor_ts__hashbrown-0.15.2//:hashbrown",
+        "@vendor_ts__hashbrown-0.15.4//:hashbrown",
         "@vendor_ts__serde-1.0.219//:serde",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.bazel
new file mode 100644
index 000000000000..42a92804c85a
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.intrusive-collections-0.9.7.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "intrusive_collections",
+    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",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2018",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=intrusive-collections",
+        "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.7",
+    deps = [
+        "@vendor_ts__memoffset-0.9.1//:memoffset",
+    ],
+)
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.77.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.76.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.js-sys-0.3.77.bazel
index aabb25c011c6..c7cad35aed57 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.77.bazel
@@ -92,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.76",
+    version = "0.3.77",
     deps = [
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.99//:wasm_bindgen",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.100//: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.1.1.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.0.8.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.kqueue-1.1.1.bazel
index 7fa12a19651f..d2fcbb68bae6 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.1.1.bazel
@@ -35,7 +35,7 @@ rust_library(
         ],
     ),
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.8",
+    version = "1.1.1",
     deps = [
         "@vendor_ts__kqueue-sys-1.0.4//:kqueue_sys",
         "@vendor_ts__libc-0.2.174//:libc",
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.4.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.libredox-0.1.4.bazel
index e29c1c5302cc..606bd2a25950 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.4.bazel
@@ -88,10 +88,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.3",
+    version = "0.1.4",
     deps = [
         "@vendor_ts__bitflags-2.9.1//:bitflags",
         "@vendor_ts__libc-0.2.174//:libc",
-        "@vendor_ts__redox_syscall-0.5.8//:syscall",
+        "@vendor_ts__redox_syscall-0.5.13//:syscall",
     ],
 )
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.13.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.12.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.lock_api-0.4.13.bazel
index 24de2e5e9b4c..e0bfa81b31f3 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.13.bazel
@@ -96,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.4.12",
+    version = "0.4.13",
     deps = [
-        "@vendor_ts__lock_api-0.4.12//:build_script_build",
+        "@vendor_ts__lock_api-0.4.13//:build_script_build",
         "@vendor_ts__scopeguard-1.2.0//:scopeguard",
     ],
 )
@@ -155,10 +155,10 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.4.12",
+    version = "0.4.13",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
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 c0df5fd6d15f..41234413ee70 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
@@ -155,7 +155,7 @@ cargo_build_script(
     version = "0.9.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
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.4.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.mio-1.0.4.bazel
index 10d2ed3a4f3c..098fbb7173c2 100644
--- 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.4.bazel
@@ -94,7 +94,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.3",
+    version = "1.0.4",
     deps = [
         "@vendor_ts__log-0.4.27//:log",
     ] + select({
@@ -111,7 +111,7 @@ rust_library(
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:aarch64-unknown-fuchsia": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
@@ -141,7 +141,7 @@ rust_library(
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:i686-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # cfg(windows)
+            "@vendor_ts__windows-sys-0.59.0//:windows_sys",  # cfg(windows)
         ],
         "@rules_rust//rust/platform:i686-unknown-freebsd": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
@@ -157,7 +157,7 @@ rust_library(
         ],
         "@rules_rust//rust/platform:wasm32-wasip1": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(target_os = "wasi")
-            "@vendor_ts__wasi-0.11.0-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
+            "@vendor_ts__wasi-0.11.1-wasi-snapshot-preview1//:wasi",  # cfg(target_os = "wasi")
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
@@ -169,7 +169,7 @@ rust_library(
             "@vendor_ts__libc-0.2.174//:libc",  # cfg(unix)
         ],
         "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
-            "@vendor_ts__windows-sys-0.52.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_ts__libc-0.2.174//:libc",  # cfg(unix)
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
index 36f3abaff0ac..70889e441f02 100644
--- 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
@@ -106,39 +106,39 @@ rust_library(
             "@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"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:i686-apple-darwin": [
             "@vendor_ts__bitflags-2.9.1//:bitflags",  # cfg(target_os = "macos")
@@ -146,53 +146,53 @@ rust_library(
         ],
         "@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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "@rules_rust//rust/platform:x86_64-apple-darwin": [
             "@vendor_ts__bitflags-2.9.1//: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"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__kqueue-1.1.1//:kqueue",  # cfg(any(target_os = "freebsd", target_os = "openbsd", target_os = "netbsd", target_os = "dragonflybsd", target_os = "ios"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//: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"))
+            "@vendor_ts__mio-1.0.4//:mio",  # cfg(any(target_os = "linux", target_os = "android"))
         ],
         "//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 ac2b7c3b887b..3b7620f1e5ad 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
@@ -157,7 +157,7 @@ cargo_build_script(
     version = "0.2.19",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__autocfg-1.4.0//:autocfg",
+        "@vendor_ts__autocfg-1.5.0//:autocfg",
     ],
 )
 
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.21.3.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.20.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell-1.21.3.bazel
index 4893cbf637e8..1611f8ad4e83 100644
--- 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.21.3.bazel
@@ -94,5 +94,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.20.3",
+    version = "1.21.3",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.bazel
new file mode 100644
index 000000000000..08819b64aa44
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.once_cell_polyfill-1.70.1.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "once_cell_polyfill",
+    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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=once_cell_polyfill",
+        "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.70.1",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.bazel
new file mode 100644
index 000000000000..214b3d3caab9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.papaya-0.2.3.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "papaya",
+    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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=papaya",
+        "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.3",
+    deps = [
+        "@vendor_ts__equivalent-1.0.2//:equivalent",
+        "@vendor_ts__seize-0.5.0//:seize",
+    ],
+)
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.4.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.3.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot-0.12.4.bazel
index a1275079363b..60ff4d9e26d4 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.4.bazel
@@ -91,9 +91,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.12.3",
+    version = "0.12.4",
     deps = [
-        "@vendor_ts__lock_api-0.4.12//:lock_api",
-        "@vendor_ts__parking_lot_core-0.9.10//:parking_lot_core",
+        "@vendor_ts__lock_api-0.4.13//:lock_api",
+        "@vendor_ts__parking_lot_core-0.9.11//: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.11.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.10.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.parking_lot_core-0.9.11.bazel
index 75c9885a2067..dd30b9a5bc13 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.11.bazel
@@ -92,10 +92,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.10",
+    version = "0.9.11",
     deps = [
         "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__parking_lot_core-0.9.10//:build_script_build",
+        "@vendor_ts__parking_lot_core-0.9.11//:build_script_build",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ] + select({
         "@rules_rust//rust/platform:aarch64-apple-darwin": [
@@ -231,7 +231,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.9.10",
+    version = "0.9.11",
     visibility = ["//visibility:private"],
 )
 
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 96ef21c3d842..44f538367d37 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
@@ -90,9 +90,9 @@ rust_proc_macro(
     }),
     version = "0.2.9",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//: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.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
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 a0b594ce3e0e..aec5d8e678db 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
@@ -97,6 +97,6 @@ rust_library(
     version = "0.6.5",
     deps = [
         "@vendor_ts__fixedbitset-0.4.2//:fixedbitset",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.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.1.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.portable-atomic-1.11.1.bazel
index fab3e1529c9f..c481da86e5de 100644
--- 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.1.bazel
@@ -96,9 +96,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.11.0",
+    version = "1.11.1",
     deps = [
-        "@vendor_ts__portable-atomic-1.11.0//:build_script_build",
+        "@vendor_ts__portable-atomic-1.11.1//:build_script_build",
     ],
 )
 
@@ -154,7 +154,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.11.0",
+    version = "1.11.1",
     visibility = ["//visibility:private"],
 )
 
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.21.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ppv-lite86-0.2.21.bazel
index cb4aa1270916..1027543b5e7f 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.21.bazel
@@ -92,8 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.20",
+    version = "0.2.21",
     deps = [
-        "@vendor_ts__zerocopy-0.7.35//:zerocopy",
+        "@vendor_ts__zerocopy-0.8.26//:zerocopy",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.97.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.97.bazel
index 2ba0ce40df9f..393ebc5392bf 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.95.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.proc-macro2-1.0.97.bazel
@@ -96,10 +96,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.95",
+    version = "1.0.97",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:build_script_build",
-        "@vendor_ts__unicode-ident-1.0.17//:unicode_ident",
+        "@vendor_ts__proc-macro2-1.0.97//:build_script_build",
+        "@vendor_ts__unicode-ident-1.0.18//:unicode_ident",
     ],
 )
 
@@ -155,7 +155,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.95",
+    version = "1.0.97",
     visibility = ["//visibility:private"],
 )
 
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 d0e023cf5cdd..7e1cf59384c8 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
@@ -99,10 +99,10 @@ rust_library(
     }),
     version = "0.10.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//: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.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
         "@vendor_ts__yansi-1.0.1//:yansi",
     ],
 )
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
index 49b6c2015218..aa96a49c642e 100644
--- 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
@@ -94,6 +94,6 @@ rust_library(
     }),
     version = "1.0.40",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.0.bazel
new file mode 100644
index 000000000000..7a7f59d9f4c0
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.r-efi-5.3.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "r_efi",
+    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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=r-efi",
+        "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 = "5.3.0",
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
index 77e39ac60c4e..df3ed9bebacd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_abi-0.123.0.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_hashes-0.116.0//:ra_ap_rustc_hashes": "rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes": "rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
     },
     compile_data = glob(
         include = ["**"],
@@ -92,11 +92,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
         "@vendor_ts__bitflags-2.9.1//:bitflags",
-        "@vendor_ts__ra-ap-rustc_hashes-0.116.0//:ra_ap_rustc_hashes",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_hashes-0.123.0//:ra_ap_rustc_hashes",
+        "@vendor_ts__ra-ap-rustc_index-0.123.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_hashes-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
index b92c4f5d59a8..65ca37ead027 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_hashes-0.123.0.bazel
@@ -88,8 +88,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__rustc-stable-hash-0.1.1//:rustc_stable_hash",
+        "@vendor_ts__rustc-stable-hash-0.1.2//:rustc_stable_hash",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
index 5ae899ecf4d5..d3b5c92abd24 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index-0.123.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_index_macros-0.116.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
+        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros": "rustc_index_macros",
     },
     compile_data = glob(
         include = ["**"],
@@ -40,7 +40,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra-ap-rustc_index_macros-0.116.0//:ra_ap_rustc_index_macros",
+        "@vendor_ts__ra-ap-rustc_index_macros-0.123.0//:ra_ap_rustc_index_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -94,7 +94,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
index ed11fe7b762b..6bb6017e68d6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_index_macros-0.123.0.bazel
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
index 9c9bce913675..8190270b4876 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.121.0.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.121.0",
     deps = [
         "@vendor_ts__memchr-2.7.5//:memchr",
         "@vendor_ts__unicode-properties-0.1.3//:unicode_properties",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.0.bazel
new file mode 100644
index 000000000000..fe2f610ab25e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_lexer-0.123.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.123.0",
+    deps = [
+        "@vendor_ts__memchr-2.7.5//: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_parse_format-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
similarity index 94%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
index 2e1cb7d1e2d4..7fedf84a6194 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_parse_format-0.121.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer": "rustc_lexer",
+        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer": "rustc_lexer",
     },
     compile_data = glob(
         include = ["**"],
@@ -91,9 +91,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.121.0",
     deps = [
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__rustc-literal-escaper-0.0.2//:rustc_literal_escaper",
+        "@vendor_ts__ra-ap-rustc_lexer-0.121.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
index d31775913f08..b21233957f39 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index": "rustc_index",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index": "rustc_index",
     },
     compile_data = glob(
         include = ["**"],
@@ -91,9 +91,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.116.0",
+    version = "0.123.0",
     deps = [
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.300.bazel
similarity index 82%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.300.bazel
index 585d66359200..de5ec1e085de 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_base_db-0.0.300.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -45,8 +45,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -100,18 +100,18 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__dashmap-6.1.0//:dashmap",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__semver-1.0.26//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.300.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.300.bazel
index 820502e96b43..164407b7d4e3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_cfg-0.0.300.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -95,10 +95,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_tt-0.0.300//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.300.bazel
index 8f5390d881bf..43ed08a0c63a 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_edition-0.0.300.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.300.bazel
similarity index 76%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.300.bazel
index 0aceb0bb68f7..8ddcf402e834 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir-0.0.300.bazel
@@ -23,16 +23,16 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty": "hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.300//:ra_ap_hir_ty": "hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -100,22 +100,22 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__either-1.15.0//:either",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_hir_ty-0.0.300//:ra_ap_hir_ty",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.300.bazel
similarity index 75%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.300.bazel
index 59654b11ac75..c44207c333df 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_def-0.0.300.bazel
@@ -23,16 +23,16 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.300//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -49,8 +49,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -104,7 +104,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__bitflags-2.9.1//:bitflags",
@@ -112,23 +112,23 @@ rust_library(
         "@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__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra-ap-rustc_abi-0.116.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_parse_format-0.116.0//:ra_ap_rustc_parse_format",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_parse_format-0.121.0//:ra_ap_rustc_parse_format",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.300//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__text-size-1.1.1//:text_size",
         "@vendor_ts__thin-vec-0.2.14//:thin_vec",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.300.bazel
similarity index 74%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.300.bazel
index b64475085519..af75f70ce67d 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_expand-0.0.300.bazel
@@ -23,17 +23,17 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe": "mbe",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_mbe-0.0.300//:ra_ap_mbe": "mbe",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.300//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -50,8 +50,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -105,23 +105,23 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__cov-mark-2.0.0//:cov_mark",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_mbe-0.0.288//:ra_ap_mbe",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_mbe-0.0.300//:ra_ap_mbe",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.300//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__smallvec-1.15.1//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.300.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.300.bazel
index 6b3be0fba4e3..689b518ccf38 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_hir_ty-0.0.300.bazel
@@ -23,14 +23,14 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def": "hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def": "hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
     },
     compile_data = glob(
         include = ["**"],
@@ -48,8 +48,8 @@ rust_library(
     edition = "2024",
     proc_macro_deps = [
         "@vendor_ts__chalk-derive-0.103.0//:chalk_derive",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -103,7 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__bitflags-2.9.1//:bitflags",
@@ -113,23 +113,23 @@ rust_library(
         "@vendor_ts__cov-mark-2.0.0//:cov_mark",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__ena-0.14.3//:ena",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
         "@vendor_ts__oorandom-11.1.5//:oorandom",
-        "@vendor_ts__ra-ap-rustc_abi-0.116.0//:ra_ap_rustc_abi",
-        "@vendor_ts__ra-ap-rustc_index-0.116.0//:ra_ap_rustc_index",
-        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.116.0//:ra_ap_rustc_pattern_analysis",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
+        "@vendor_ts__ra-ap-rustc_abi-0.123.0//:ra_ap_rustc_abi",
+        "@vendor_ts__ra-ap-rustc_index-0.123.0//:ra_ap_rustc_index",
+        "@vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0//:ra_ap_rustc_pattern_analysis",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__rustc_apfloat-0.2.3-llvm-462a31f5a5ab//:rustc_apfloat",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.0//:salsa",
         "@vendor_ts__scoped-tls-1.0.1//:scoped_tls",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.300.bazel
similarity index 78%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.300.bazel
index 52fb38a0662e..af1e936dc0ca 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_ide_db-0.0.300.bazel
@@ -23,15 +23,15 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir": "hir",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_profile-0.0.288//:ra_ap_profile": "profile",
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro": "query_group",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_hir-0.0.300//:ra_ap_hir": "hir",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_profile-0.0.300//:ra_ap_profile": "profile",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro": "query_group",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -48,8 +48,8 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2024",
     proc_macro_deps = [
-        "@vendor_ts__ra_ap_query-group-macro-0.0.288//:ra_ap_query_group_macro",
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__ra_ap_query-group-macro-0.0.300//:ra_ap_query_group_macro",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -103,7 +103,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__bitflags-2.9.1//:bitflags",
@@ -111,22 +111,22 @@ rust_library(
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__line-index-0.1.2//:line_index",
         "@vendor_ts__memchr-2.7.5//:memchr",
         "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_profile-0.0.288//:ra_ap_profile",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_hir-0.0.300//:ra_ap_hir",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
+        "@vendor_ts__ra_ap_profile-0.0.300//:ra_ap_profile",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
         "@vendor_ts__rayon-1.10.0//:rayon",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.300.bazel
index 9c0c23c1f6b5..27f7bab382c9 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_intern-0.0.300.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__dashmap-6.1.0//:dashmap",
         "@vendor_ts__hashbrown-0.14.5//:hashbrown",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.300.bazel
similarity index 77%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.300.bazel
index 06318029c82c..946a2dc743ff 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_load-cargo-0.0.300.bazel
@@ -23,15 +23,15 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand": "hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db": "ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.288//:ra_ap_proc_macro_api": "proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model": "project_model",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.288//:ra_ap_vfs_notify": "vfs_notify",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand": "hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.300//:ra_ap_ide_db": "ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.300//:ra_ap_proc_macro_api": "proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.300//:ra_ap_project_model": "project_model",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.300//:ra_ap_vfs_notify": "vfs_notify",
     },
     compile_data = glob(
         include = ["**"],
@@ -99,20 +99,20 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:anyhow",
+        "@vendor_ts__anyhow-1.0.99//:anyhow",
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand",
-        "@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_proc_macro_api-0.0.288//:ra_ap_proc_macro_api",
-        "@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
-        "@vendor_ts__ra_ap_vfs-notify-0.0.288//:ra_ap_vfs_notify",
+        "@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand",
+        "@vendor_ts__ra_ap_ide_db-0.0.300//:ra_ap_ide_db",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_proc_macro_api-0.0.300//:ra_ap_proc_macro_api",
+        "@vendor_ts__ra_ap_project_model-0.0.300//:ra_ap_project_model",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_vfs-notify-0.0.300//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.300.bazel
similarity index 83%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.300.bazel
index 061ad2240569..5417da2031a7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_mbe-0.0.300.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge": "syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.300//:ra_ap_syntax_bridge": "syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -96,17 +96,17 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
         "@vendor_ts__cov-mark-2.0.0//:cov_mark",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-bridge-0.0.288//:ra_ap_syntax_bridge",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-bridge-0.0.300//:ra_ap_syntax_bridge",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.300.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.300.bazel
index 6c236f815c67..8ed11d914952 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_parser-0.0.300.bazel
@@ -23,7 +23,7 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_edition-0.0.288//:ra_ap_edition": "edition",
+        "@vendor_ts__ra_ap_edition-0.0.300//:ra_ap_edition": "edition",
     },
     compile_data = glob(
         include = ["**"],
@@ -95,12 +95,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__drop_bomb-0.1.5//:drop_bomb",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_edition-0.0.288//:ra_ap_edition",
-        "@vendor_ts__rustc-literal-escaper-0.0.3//:rustc_literal_escaper",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_edition-0.0.300//:ra_ap_edition",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
         "@vendor_ts__tracing-0.1.41//:tracing",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.300.bazel
index 2bbfbca6dc11..ecaa639c662e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_paths-0.0.300.bazel
@@ -91,7 +91,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__camino-1.1.10//:camino",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.300.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.300.bazel
index 97084be0d2a4..332966ee7491 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_proc_macro_api-0.0.300.bazel
@@ -23,11 +23,11 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -98,17 +98,17 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_tt-0.0.300//: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__serde_json-1.0.142//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.300.bazel
index 2522ef6c0804..c897e7748da6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_profile-0.0.300.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__cfg-if-1.0.1//:cfg_if",
     ] + select({
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.300.bazel
similarity index 79%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.300.bazel
index 5cbd98eb3309..fb930fafd0ab 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_project_model-0.0.300.bazel
@@ -23,13 +23,13 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db": "base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg": "cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.288//:ra_ap_toolchain": "toolchain",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db": "base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg": "cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.300//:ra_ap_toolchain": "toolchain",
     },
     compile_data = glob(
         include = ["**"],
@@ -100,23 +100,24 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__anyhow-1.0.98//:anyhow",
-        "@vendor_ts__cargo_metadata-0.20.0//:cargo_metadata",
+        "@vendor_ts__anyhow-1.0.99//:anyhow",
+        "@vendor_ts__cargo_metadata-0.21.0//:cargo_metadata",
         "@vendor_ts__itertools-0.14.0//:itertools",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_base_db-0.0.288//:ra_ap_base_db",
-        "@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_toolchain-0.0.288//:ra_ap_toolchain",
+        "@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db",
+        "@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_toolchain-0.0.300//:ra_ap_toolchain",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
         "@vendor_ts__semver-1.0.26//:semver",
         "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde_json-1.0.142//:serde_json",
+        "@vendor_ts__temp-dir-0.1.16//:temp_dir",
         "@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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.300.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.300.bazel
index ba77f60997b7..a5444525a4aa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_query-group-macro-0.0.300.bazel
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.300.bazel
similarity index 90%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.300.bazel
index a621647e1401..888665c53d4e 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_span-0.0.300.bazel
@@ -23,9 +23,9 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -97,15 +97,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__hashbrown-0.14.5//:hashbrown",
         "@vendor_ts__la-arena-0.3.1//:la_arena",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-0.22.0//:salsa",
+        "@vendor_ts__salsa-0.23.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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.300.bazel
index 6fe94fdf39a7..0ec1196ed3f6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_stdx-0.0.300.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__crossbeam-utils-0.8.21//:crossbeam_utils",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.300.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.300.bazel
index d36724e8a094..77c147097a4b 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-0.0.300.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -92,15 +92,15 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__either-1.15.0//:either",
         "@vendor_ts__itertools-0.14.0//:itertools",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
         "@vendor_ts__rowan-0.15.15//:rowan",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__rustc-literal-escaper-0.0.3//:rustc_literal_escaper",
+        "@vendor_ts__rustc-literal-escaper-0.0.4//:rustc_literal_escaper",
         "@vendor_ts__smol_str-0.3.2//:smol_str",
         "@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_syntax-bridge-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.300.bazel
similarity index 84%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.300.bazel
index 1437cfd81f58..b9741a866e05 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_syntax-bridge-0.0.300.bazel
@@ -23,12 +23,12 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser": "parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span": "span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax": "syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt": "tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser": "parser",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span": "span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax": "syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt": "tt",
     },
     compile_data = glob(
         include = ["**"],
@@ -96,14 +96,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser",
-        "@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax",
-        "@vendor_ts__ra_ap_tt-0.0.288//:ra_ap_tt",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser",
+        "@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax",
+        "@vendor_ts__ra_ap_tt-0.0.300//:ra_ap_tt",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.300.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.300.bazel
index d5810dbca8f8..b077ab9b1ef8 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_toolchain-0.0.300.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__camino-1.1.10//:camino",
         "@vendor_ts__home-0.5.11//:home",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.300.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.300.bazel
index 486ce92d90b1..a9dc4cbb42f3 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_tt-0.0.300.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern": "intern",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern": "intern",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -92,12 +92,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__arrayvec-0.7.6//:arrayvec",
-        "@vendor_ts__ra-ap-rustc_lexer-0.116.0//:ra_ap_rustc_lexer",
-        "@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra-ap-rustc_lexer-0.123.0//:ra_ap_rustc_lexer",
+        "@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern",
+        "@vendor_ts__ra_ap_stdx-0.0.300//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.300.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.300.bazel
index 0e8b8fcd7e3a..1ddf26373e25 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-0.0.300.bazel
@@ -23,8 +23,8 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
     },
     compile_data = glob(
         include = ["**"],
@@ -92,14 +92,14 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__fst-0.4.7//:fst",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__nohash-hasher-0.2.0//:nohash_hasher",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.300//: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.288.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.300.bazel
similarity index 91%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.288.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.300.bazel
index f98d75024ea6..1c9c87f94bfc 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.288.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ra_ap_vfs-notify-0.0.300.bazel
@@ -23,9 +23,9 @@ rust_library(
         allow_empty = True,
     ),
     aliases = {
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths": "paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx": "stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs": "vfs",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths": "paths",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx": "stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.300//:ra_ap_vfs": "vfs",
     },
     compile_data = glob(
         include = ["**"],
@@ -93,13 +93,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.288",
+    version = "0.0.300",
     deps = [
         "@vendor_ts__crossbeam-channel-0.5.15//:crossbeam_channel",
         "@vendor_ts__notify-8.0.0//:notify",
-        "@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths",
-        "@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx",
-        "@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs",
+        "@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths",
+        "@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx",
+        "@vendor_ts__ra_ap_vfs-0.0.300//: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",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
index 47ae67f08885..76eee3e10fc7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand-0.9.2.bazel
@@ -97,9 +97,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.1",
+    version = "0.9.2",
     deps = [
         "@vendor_ts__rand_chacha-0.9.0//:rand_chacha",
-        "@vendor_ts__rand_core-0.9.2//:rand_core",
+        "@vendor_ts__rand_core-0.9.3//: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
index 1ce834357325..23a86fd3b81c 100644
--- 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
@@ -93,7 +93,7 @@ rust_library(
     }),
     version = "0.9.0",
     deps = [
-        "@vendor_ts__ppv-lite86-0.2.20//:ppv_lite86",
-        "@vendor_ts__rand_core-0.9.2//:rand_core",
+        "@vendor_ts__ppv-lite86-0.2.21//:ppv_lite86",
+        "@vendor_ts__rand_core-0.9.3//:rand_core",
     ],
 )
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.3.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rand_core-0.9.3.bazel
index 7c0ca6725909..7d2ea3945b8c 100644
--- 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.3.bazel
@@ -92,9 +92,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.9.2",
+    version = "0.9.3",
     deps = [
-        "@vendor_ts__getrandom-0.3.1//:getrandom",
-        "@vendor_ts__zerocopy-0.8.20//:zerocopy",
+        "@vendor_ts__getrandom-0.3.3//:getrandom",
     ],
 )
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.13.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.8.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.redox_syscall-0.5.13.bazel
index 6ee1fcaa938d..2c22ff5a4c54 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.13.bazel
@@ -88,7 +88,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.5.8",
+    version = "0.5.13",
     deps = [
         "@vendor_ts__bitflags-2.9.1//:bitflags",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
index ceeea730440f..38fec2277f01 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ref-cast-impl-1.0.24.bazel
@@ -90,8 +90,8 @@ rust_proc_macro(
     }),
     version = "1.0.24",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.bazel
deleted file mode 100644
index f5ded90eee81..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.3.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//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "rustc_literal_escaper",
-    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_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=rustc-literal-escaper",
-        "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.3",
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
index 9a56ccdfbec2..6636618777f1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-literal-escaper-0.0.4.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.0.2",
+    version = "0.0.4",
 )
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.2.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustc-stable-hash-0.1.2.bazel
index b35f640c18ca..b087a116ce20 100644
--- 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.2.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.1",
+    version = "0.1.2",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.21.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.21.bazel
new file mode 100644
index 000000000000..53d7609768aa
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.rustversion-1.0.21.bazel
@@ -0,0 +1,157 @@
+###############################################################################
+# @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",
+    "cargo_toml_env_vars",
+)
+load("@rules_rust//rust:defs.bzl", "rust_proc_macro")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.21",
+    deps = [
+        "@vendor_ts__rustversion-1.0.21//: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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=rustversion",
+        "manual",
+        "noclippy",
+        "norustfmt",
+    ],
+    version = "1.0.21",
+    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.19.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.ryu-1.0.20.bazel
index d86a32cc46cd..4a971256e838 100644
--- 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.20.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.19",
+    version = "1.0.20",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
similarity index 88%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
index a01bae583ad3..949a19b9b1bd 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-0.23.0.bazel
@@ -43,7 +43,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__salsa-macros-0.22.0//:salsa_macros",
+        "@vendor_ts__salsa-macros-0.23.0//:salsa_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -97,19 +97,21 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
     deps = [
         "@vendor_ts__boxcar-0.2.13//: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__crossbeam-utils-0.8.21//:crossbeam_utils",
+        "@vendor_ts__hashbrown-0.15.4//:hashbrown",
         "@vendor_ts__hashlink-0.10.0//:hashlink",
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
-        "@vendor_ts__parking_lot-0.12.3//:parking_lot",
-        "@vendor_ts__portable-atomic-1.11.0//:portable_atomic",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
+        "@vendor_ts__intrusive-collections-0.9.7//:intrusive_collections",
+        "@vendor_ts__papaya-0.2.3//:papaya",
+        "@vendor_ts__parking_lot-0.12.4//:parking_lot",
+        "@vendor_ts__portable-atomic-1.11.1//:portable_atomic",
         "@vendor_ts__rayon-1.10.0//:rayon",
         "@vendor_ts__rustc-hash-2.1.1//:rustc_hash",
-        "@vendor_ts__salsa-macro-rules-0.22.0//:salsa_macro_rules",
+        "@vendor_ts__salsa-macro-rules-0.23.0//:salsa_macro_rules",
         "@vendor_ts__smallvec-1.15.1//:smallvec",
         "@vendor_ts__thin-vec-0.2.14//:thin_vec",
         "@vendor_ts__tracing-0.1.41//:tracing",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
index 88855a571b52..d351f598b7ba 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macro-rules-0.23.0.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
similarity index 94%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
index 3d1c5c6e30b4..72f1a5b649aa 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.22.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.salsa-macros-0.23.0.bazel
@@ -88,12 +88,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.22.0",
+    version = "0.23.0",
     deps = [
-        "@vendor_ts__heck-0.5.0//:heck",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
index f0a4f6dbe74a..3f8b85b24489 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-0.9.0.bazel
@@ -93,6 +93,6 @@ rust_library(
         "@vendor_ts__dyn-clone-1.0.19//:dyn_clone",
         "@vendor_ts__ref-cast-1.0.24//:ref_cast",
         "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:serde_json",
+        "@vendor_ts__serde_json-1.0.142//:serde_json",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.bazel
new file mode 100644
index 000000000000..1197212d2bcb
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.schemars-1.0.4.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "schemars",
+    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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=schemars",
+        "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.4",
+    deps = [
+        "@vendor_ts__dyn-clone-1.0.19//:dyn_clone",
+        "@vendor_ts__ref-cast-1.0.24//:ref_cast",
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_json-1.0.142//:serde_json",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
new file mode 100644
index 000000000000..f7104958ace5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.seize-0.5.0.bazel
@@ -0,0 +1,112 @@
+###############################################################################
+# @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_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "seize",
+    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",
+        "fast-barrier",
+        "libc",
+        "windows-sys",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=seize",
+        "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.5.0",
+    deps = [
+        "@vendor_ts__libc-0.2.174//:libc",
+    ] + select({
+        "@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # aarch64-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:i686-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # i686-pc-windows-msvc
+        ],
+        "@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
+            "@vendor_ts__windows-sys-0.52.0//:windows_sys",  # x86_64-pc-windows-msvc
+        ],
+        "//conditions:default": [],
+    }),
+)
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
index 36abf3866f90..54f67711a1ef 100644
--- 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
@@ -93,8 +93,8 @@ rust_proc_macro(
     }),
     version = "1.0.219",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
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.142.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.140.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_json-1.0.142.bazel
index c4632eee008f..2da5ba551f16 100644
--- 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.142.bazel
@@ -97,13 +97,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.140",
+    version = "1.0.142",
     deps = [
         "@vendor_ts__itoa-1.0.15//:itoa",
         "@vendor_ts__memchr-2.7.5//:memchr",
-        "@vendor_ts__ryu-1.0.19//:ryu",
+        "@vendor_ts__ryu-1.0.20//:ryu",
         "@vendor_ts__serde-1.0.219//:serde",
-        "@vendor_ts__serde_json-1.0.140//:build_script_build",
+        "@vendor_ts__serde_json-1.0.142//:build_script_build",
     ],
 )
 
@@ -160,7 +160,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "1.0.140",
+    version = "1.0.142",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.0.bazel
new file mode 100644
index 000000000000..e0c6242de6f5
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_spanned-1.0.0.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "serde_spanned",
+    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",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=serde_spanned",
+        "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.0",
+    deps = [
+        "@vendor_ts__serde-1.0.219//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.0.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.0.bazel
index 0c1498841f16..08f8fdf38800 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with-3.14.0.bazel
@@ -44,7 +44,7 @@ rust_library(
     edition = "2021",
     proc_macro_deps = [
         "@vendor_ts__serde_derive-1.0.219//:serde_derive",
-        "@vendor_ts__serde_with_macros-3.13.0//:serde_with_macros",
+        "@vendor_ts__serde_with_macros-3.14.0//:serde_with_macros",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -98,7 +98,7 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.13.0",
+    version = "3.14.0",
     deps = [
         "@vendor_ts__serde-1.0.219//:serde",
     ],
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.0.bazel
similarity index 95%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.0.bazel
index 38781f474488..e36f146513e7 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.13.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.serde_with_macros-3.14.0.bazel
@@ -88,11 +88,11 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "3.13.0",
+    version = "3.14.0",
     deps = [
-        "@vendor_ts__darling-0.20.10//:darling",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__darling-0.20.11//:darling",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//: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 efa0d88a1ac1..9a4e6a300877 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
@@ -90,9 +90,9 @@ rust_library(
     }),
     version = "0.9.34+deprecated",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__itoa-1.0.15//:itoa",
-        "@vendor_ts__ryu-1.0.19//:ryu",
+        "@vendor_ts__ryu-1.0.20//: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.syn-2.0.103.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.104.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.103.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.104.bazel
index d7247d1235f0..d33a680bd2ee 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.103.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.syn-2.0.104.bazel
@@ -101,10 +101,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "2.0.103",
+    version = "2.0.104",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__unicode-ident-1.0.17//:unicode_ident",
+        "@vendor_ts__unicode-ident-1.0.18//: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.2.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.synstructure-0.13.2.bazel
index 67c558360354..5b31bf98d6f1 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.2.bazel
@@ -92,10 +92,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.13.1",
+    version = "0.13.2",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
index cb0e7c07ee30..97833eecfaf0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.byteorder-1.5.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.temp-dir-0.1.16.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "byteorder",
+    name = "temp_dir",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=byteorder",
+        "crate-name=temp-dir",
         "manual",
         "noclippy",
         "norustfmt",
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.5.0",
+    version = "0.1.16",
 )
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
deleted file mode 100644
index 00be21d71753..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-1.0.69.bazel
+++ /dev/null
@@ -1,160 +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",
-    "cargo_toml_env_vars",
-)
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-rust_library(
-    name = "thiserror",
-    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__thiserror-impl-1.0.69//:thiserror_impl",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "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.69",
-    deps = [
-        "@vendor_ts__thiserror-1.0.69//: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 = "thiserror",
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    rustc_flags = [
-        "--cap-lints=allow",
-    ],
-    tags = [
-        "cargo-bazel",
-        "crate-name=thiserror",
-        "manual",
-        "noclippy",
-        "norustfmt",
-    ],
-    version = "1.0.69",
-    visibility = ["//visibility:private"],
-)
-
-alias(
-    name = "build_script_build",
-    actual = ":_bs",
-    tags = ["manual"],
-)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel
index 845df8353bf5..ff86a30bb1c6 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-2.0.12.bazel
@@ -90,8 +90,8 @@ rust_proc_macro(
     }),
     version = "2.0.12",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//: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 0a1b6865944b..fdb1e3df88ca 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
@@ -91,6 +91,6 @@ rust_library(
     version = "1.1.8",
     deps = [
         "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__once_cell-1.21.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.41.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.37.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-0.3.41.bazel
index c7ad459f04c8..1b720393766f 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.41.bazel
@@ -88,11 +88,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.3.37",
+    version = "0.3.41",
     deps = [
-        "@vendor_ts__deranged-0.3.11//:deranged",
+        "@vendor_ts__deranged-0.4.0//: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",
+        "@vendor_ts__time-core-0.1.4//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.4.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.4.bazel
index 923ab44f1630..ba20cfd5d040 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.2.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-core-0.1.4.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.2",
+    version = "0.1.4",
 )
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.22.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.19.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.time-macros-0.2.22.bazel
index 204fbd140dc9..97ace68543e7 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.22.bazel
@@ -88,9 +88,9 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.19",
+    version = "0.2.22",
     deps = [
         "@vendor_ts__num-conv-0.1.0//:num_conv",
-        "@vendor_ts__time-core-0.1.2//:time_core",
+        "@vendor_ts__time-core-0.1.4//:time_core",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.5.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.5.bazel
new file mode 100644
index 000000000000..196f0c87a31e
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml-0.9.5.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.9.5",
+    deps = [
+        "@vendor_ts__serde-1.0.219//:serde",
+        "@vendor_ts__serde_spanned-1.0.0//:serde_spanned",
+        "@vendor_ts__toml_datetime-0.7.0//:toml_datetime",
+        "@vendor_ts__toml_parser-1.0.2//:toml_parser",
+        "@vendor_ts__toml_writer-1.0.2//:toml_writer",
+        "@vendor_ts__winnow-0.7.11//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.0.bazel
new file mode 100644
index 000000000000..6d3a99fb0f60
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_datetime-0.7.0.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_datetime",
+    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",
+        "serde",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_datetime",
+        "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.0",
+    deps = [
+        "@vendor_ts__serde-1.0.219//:serde",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
index be91209ae645..73e49a5bec17 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_edit-0.22.27.bazel
@@ -95,7 +95,7 @@ rust_library(
     }),
     version = "0.22.27",
     deps = [
-        "@vendor_ts__indexmap-2.9.0//:indexmap",
+        "@vendor_ts__indexmap-2.10.0//:indexmap",
         "@vendor_ts__serde-1.0.219//:serde",
         "@vendor_ts__serde_spanned-0.6.9//:serde_spanned",
         "@vendor_ts__toml_datetime-0.6.11//:toml_datetime",
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.2.bazel
new file mode 100644
index 000000000000..d5c30a262907
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_parser-1.0.2.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_parser",
+    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",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_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 = "1.0.2",
+    deps = [
+        "@vendor_ts__winnow-0.7.11//:winnow",
+    ],
+)
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.2.bazel
new file mode 100644
index 000000000000..4193266e6d04
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.toml_writer-1.0.2.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+rust_library(
+    name = "toml_writer",
+    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",
+        "std",
+    ],
+    crate_root = "src/lib.rs",
+    edition = "2021",
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
+    tags = [
+        "cargo-bazel",
+        "crate-name=toml_writer",
+        "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.2",
+)
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 52f1d1407190..1e49c47fd1e3 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
@@ -43,7 +43,7 @@ rust_library(
     crate_root = "src/lib.rs",
     edition = "2018",
     proc_macro_deps = [
-        "@vendor_ts__tracing-attributes-0.1.28//:tracing_attributes",
+        "@vendor_ts__tracing-attributes-0.1.30//:tracing_attributes",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -100,6 +100,6 @@ rust_library(
     version = "0.1.41",
     deps = [
         "@vendor_ts__pin-project-lite-0.2.16//:pin_project_lite",
-        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__tracing-core-0.1.34//: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.30.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.28.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-attributes-0.1.30.bazel
index dbe9e94771df..fa6532ba1fdf 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.30.bazel
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.28",
+    version = "0.1.30",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//: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.34.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.33.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.tracing-core-0.1.34.bazel
index 1f6fab9f8171..a1fb8f6e7764 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.34.bazel
@@ -93,8 +93,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.33",
+    version = "0.1.34",
     deps = [
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
     ],
 )
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 648508de095e..afde86be9452 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
@@ -95,7 +95,7 @@ rust_library(
     version = "0.2.0",
     deps = [
         "@vendor_ts__log-0.4.27//:log",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__tracing-core-0.1.33//:tracing_core",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__tracing-core-0.1.34//: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 5e28965c1424..b66d0003b2a4 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
@@ -110,13 +110,13 @@ rust_library(
     deps = [
         "@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__once_cell-1.21.3//:once_cell",
         "@vendor_ts__regex-1.11.1//:regex",
         "@vendor_ts__sharded-slab-0.1.7//:sharded_slab",
         "@vendor_ts__smallvec-1.15.1//: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-core-0.1.34//: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 1a4d9052b647..cfa7b65f2055 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
@@ -162,7 +162,7 @@ cargo_build_script(
     version = "0.24.6",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//: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 b11c5f6a7f7c..47d76515ad12 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
@@ -150,7 +150,7 @@ cargo_build_script(
     version = "0.23.2",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//: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 2de91c5d67ed..daedbc6cdb56 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
@@ -150,7 +150,7 @@ cargo_build_script(
     version = "0.24.8",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//: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 1542f32c361a..d08108c5cc86 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
@@ -150,7 +150,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//: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 4e64a93f4eed..6fb0fab3b2bd 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
@@ -150,7 +150,7 @@ cargo_build_script(
     version = "0.23.1",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//:cc",
     ],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.18.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.18.bazel
index 3eb20d4edb0d..39820863a2ce 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.17.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.unicode-ident-1.0.18.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.17",
+    version = "1.0.18",
 )
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.1.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.valuable-0.1.1.bazel
index de1698f15768..10a3cc3548ad 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.1.bazel
@@ -39,7 +39,7 @@ rust_library(
         ],
     ),
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -92,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.0",
+    version = "0.1.1",
     deps = [
-        "@vendor_ts__valuable-0.1.0//:build_script_build",
+        "@vendor_ts__valuable-0.1.1//:build_script_build",
     ],
 )
 
@@ -131,7 +131,7 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
-    edition = "2018",
+    edition = "2021",
     pkg_name = "valuable",
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -146,7 +146,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.1.0",
+    version = "0.1.1",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
similarity index 98%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
index 742d16d635a5..6a0e8f023c43 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.11.0+wasi-snapshot-preview1",
+    version = "0.11.1+wasi-snapshot-preview1",
 )
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.14.2+wasi-0.2.4.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.13.3+wasi-0.2.2.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasi-0.14.2+wasi-0.2.4.bazel
index 0cba8ab26816..9fc7384facd7 100644
--- 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.14.2+wasi-0.2.4.bazel
@@ -88,8 +88,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.13.3+wasi-0.2.2",
+    version = "0.14.2+wasi-0.2.4",
     deps = [
-        "@vendor_ts__wit-bindgen-rt-0.33.0//:wit_bindgen_rt",
+        "@vendor_ts__wit-bindgen-rt-0.39.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.100.bazel
similarity index 93%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-0.2.100.bazel
index 23de7fd36fc7..c707d350e7ae 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.100.bazel
@@ -40,13 +40,15 @@ rust_library(
     ),
     crate_features = [
         "default",
-        "spans",
+        "msrv",
+        "rustversion",
         "std",
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
     proc_macro_deps = [
-        "@vendor_ts__wasm-bindgen-macro-0.2.99//:wasm_bindgen_macro",
+        "@vendor_ts__rustversion-1.0.21//:rustversion",
+        "@vendor_ts__wasm-bindgen-macro-0.2.100//:wasm_bindgen_macro",
     ],
     rustc_env_files = [
         ":cargo_toml_env_vars",
@@ -100,11 +102,11 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.100",
     deps = [
         "@vendor_ts__cfg-if-1.0.1//:cfg_if",
-        "@vendor_ts__once_cell-1.20.3//:once_cell",
-        "@vendor_ts__wasm-bindgen-0.2.99//:build_script_build",
+        "@vendor_ts__once_cell-1.21.3//:once_cell",
+        "@vendor_ts__wasm-bindgen-0.2.100//:build_script_build",
     ],
 )
 
@@ -129,7 +131,8 @@ cargo_build_script(
     ),
     crate_features = [
         "default",
-        "spans",
+        "msrv",
+        "rustversion",
         "std",
     ],
     crate_name = "build_script_build",
@@ -161,7 +164,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.99",
+    version = "0.2.100",
     visibility = ["//visibility:private"],
 )
 
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.100.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-backend-0.2.100.bazel
index e536d4346c49..5459cb634465 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.100.bazel
@@ -34,10 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -92,13 +88,13 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.100",
     deps = [
-        "@vendor_ts__bumpalo-3.16.0//:bumpalo",
+        "@vendor_ts__bumpalo-3.19.0//:bumpalo",
         "@vendor_ts__log-0.4.27//:log",
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__wasm-bindgen-shared-0.2.100//: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.100.bazel
similarity index 95%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-0.2.100.bazel
index 04e2e22268da..f6fb33e15f0a 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.100.bazel
@@ -34,10 +34,6 @@ rust_proc_macro(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -92,9 +88,9 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.100",
     deps = [
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__wasm-bindgen-macro-support-0.2.99//:wasm_bindgen_macro_support",
+        "@vendor_ts__wasm-bindgen-macro-support-0.2.100//: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.100.bazel
similarity index 92%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-macro-support-0.2.100.bazel
index 0672ed5d8972..026a0784f832 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.100.bazel
@@ -34,10 +34,6 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "spans",
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -92,12 +88,12 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.100",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__wasm-bindgen-backend-0.2.99//:wasm_bindgen_backend",
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:wasm_bindgen_shared",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__wasm-bindgen-backend-0.2.100//:wasm_bindgen_backend",
+        "@vendor_ts__wasm-bindgen-shared-0.2.100//: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.100.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.99.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wasm-bindgen-shared-0.2.100.bazel
index c699dc664948..0be6d5b0e337 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.100.bazel
@@ -92,9 +92,10 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.2.99",
+    version = "0.2.100",
     deps = [
-        "@vendor_ts__wasm-bindgen-shared-0.2.99//:build_script_build",
+        "@vendor_ts__unicode-ident-1.0.18//:unicode_ident",
+        "@vendor_ts__wasm-bindgen-shared-0.2.100//:build_script_build",
     ],
 )
 
@@ -147,7 +148,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.2.99",
+    version = "0.2.100",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.bazel
new file mode 100644
index 000000000000..7a76ed1b4fa9
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.61.2.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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.60.0//:windows_implement",
+        "@vendor_ts__windows-interface-0.59.1//:windows_interface",
+    ],
+    rustc_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.61.2",
+    deps = [
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
+        "@vendor_ts__windows-result-0.3.4//:windows_result",
+        "@vendor_ts__windows-strings-0.4.2//:windows_strings",
+    ],
+)
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.windows-implement-0.60.0.bazel
similarity index 95%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.thiserror-impl-1.0.69.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-implement-0.60.0.bazel
index bfe106d46ac3..4c5780af7b77 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.windows-implement-0.60.0.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_proc_macro(
-    name = "thiserror_impl",
+    name = "windows_implement",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_proc_macro(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=thiserror-impl",
+        "crate-name=windows-implement",
         "manual",
         "noclippy",
         "norustfmt",
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "1.0.69",
+    version = "0.60.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
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.windows-interface-0.59.1.bazel
similarity index 94%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.7.35.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-interface-0.59.1.bazel
index b8c3c044e857..ad3593fff25f 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.windows-interface-0.59.1.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_proc_macro(
-    name = "zerocopy_derive",
+    name = "windows_interface",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -35,7 +35,7 @@ rust_proc_macro(
         ],
     ),
     crate_root = "src/lib.rs",
-    edition = "2018",
+    edition = "2021",
     rustc_env_files = [
         ":cargo_toml_env_vars",
     ],
@@ -44,7 +44,7 @@ rust_proc_macro(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=zerocopy-derive",
+        "crate-name=windows-interface",
         "manual",
         "noclippy",
         "norustfmt",
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.7.35",
+    version = "0.59.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//: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.3.bazel
similarity index 99%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.1.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-link-0.1.3.bazel
index 94fa81560ffd..bce46b7307a9 100644
--- 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.3.bazel
@@ -88,5 +88,5 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.1.1",
+    version = "0.1.3",
 )
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-result-0.3.4.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-core-0.52.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-result-0.3.4.bazel
index e99bf40969f4..1e0a303b959f 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-result-0.3.4.bazel
@@ -17,7 +17,7 @@ cargo_toml_env_vars(
 )
 
 rust_library(
-    name = "windows_core",
+    name = "windows_result",
     srcs = glob(
         include = ["**/*.rs"],
         allow_empty = True,
@@ -44,7 +44,7 @@ rust_library(
     ],
     tags = [
         "cargo-bazel",
-        "crate-name=windows-core",
+        "crate-name=windows-result",
         "manual",
         "noclippy",
         "norustfmt",
@@ -88,8 +88,8 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.52.0",
+    version = "0.3.4",
     deps = [
-        "@vendor_ts__windows-targets-0.52.6//:windows_targets",
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.bazel
new file mode 100644
index 000000000000..cb5f79c5e8ca
--- /dev/null
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.windows-strings-0.4.2.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//cargo:defs.bzl", "cargo_toml_env_vars")
+load("@rules_rust//rust:defs.bzl", "rust_library")
+
+package(default_visibility = ["//visibility:public"])
+
+cargo_toml_env_vars(
+    name = "cargo_toml_env_vars",
+    src = "Cargo.toml",
+)
+
+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_env_files = [
+        ":cargo_toml_env_vars",
+    ],
+    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.4.2",
+    deps = [
+        "@vendor_ts__windows-link-0.1.3//:windows_link",
+    ],
+)
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 0bf14cb113f7..98dc28b5fcf4 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
@@ -34,6 +34,12 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "Win32",
+        "Win32_System",
+        "Win32_System_Threading",
+        "default",
+    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
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.39.0.bazel
similarity index 97%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.33.0.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.wit-bindgen-rt-0.39.0.bazel
index 038c60a2dc85..44b325ec96c4 100644
--- 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.39.0.bazel
@@ -92,9 +92,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.33.0",
+    version = "0.39.0",
     deps = [
-        "@vendor_ts__wit-bindgen-rt-0.33.0//:build_script_build",
+        "@vendor_ts__wit-bindgen-rt-0.39.0//:build_script_build",
     ],
 )
 
@@ -146,7 +146,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.33.0",
+    version = "0.39.0",
     visibility = ["//visibility:private"],
 )
 
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
index 57b624f83cf9..507697272f25 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.yoke-derive-0.8.0.bazel
@@ -90,9 +90,9 @@ rust_proc_macro(
     }),
     version = "0.8.0",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
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
deleted file mode 100644
index 616cecefee1f..000000000000
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.7.35.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//cargo:defs.bzl", "cargo_toml_env_vars")
-load("@rules_rust//rust:defs.bzl", "rust_library")
-
-package(default_visibility = ["//visibility:public"])
-
-cargo_toml_env_vars(
-    name = "cargo_toml_env_vars",
-    src = "Cargo.toml",
-)
-
-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 = [
-        "byteorder",
-        "default",
-        "derive",
-        "simd",
-        "zerocopy-derive",
-    ],
-    crate_root = "src/lib.rs",
-    edition = "2018",
-    proc_macro_deps = [
-        "@vendor_ts__zerocopy-derive-0.7.35//:zerocopy_derive",
-    ],
-    rustc_env_files = [
-        ":cargo_toml_env_vars",
-    ],
-    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.7.35",
-    deps = [
-        "@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.26.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-0.8.26.bazel
index 4783c0054a25..32d5cf2d5a39 100644
--- 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.26.bazel
@@ -38,6 +38,9 @@ rust_library(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "simd",
+    ],
     crate_root = "src/lib.rs",
     edition = "2021",
     rustc_env_files = [
@@ -92,9 +95,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.20",
+    version = "0.8.26",
     deps = [
-        "@vendor_ts__zerocopy-0.8.20//:build_script_build",
+        "@vendor_ts__zerocopy-0.8.26//:build_script_build",
     ],
 )
 
@@ -117,6 +120,9 @@ cargo_build_script(
             "WORKSPACE.bazel",
         ],
     ),
+    crate_features = [
+        "simd",
+    ],
     crate_name = "build_script_build",
     crate_root = "build.rs",
     data = glob(
@@ -146,7 +152,7 @@ cargo_build_script(
         "noclippy",
         "norustfmt",
     ],
-    version = "0.8.20",
+    version = "0.8.26",
     visibility = ["//visibility:private"],
 )
 
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.26.bazel
similarity index 96%
rename from misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.20.bazel
rename to misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerocopy-derive-0.8.26.bazel
index 5a397a7ec317..136da86dc00a 100644
--- 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.26.bazel
@@ -88,10 +88,10 @@ rust_proc_macro(
         "@rules_rust//rust/platform:x86_64-unknown-uefi": [],
         "//conditions:default": ["@platforms//:incompatible"],
     }),
-    version = "0.8.20",
+    version = "0.8.26",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
index 8ca846a0bf63..516b57bbff02 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerofrom-derive-0.1.6.bazel
@@ -90,9 +90,9 @@ rust_proc_macro(
     }),
     version = "0.1.6",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
-        "@vendor_ts__synstructure-0.13.1//:synstructure",
+        "@vendor_ts__syn-2.0.104//:syn",
+        "@vendor_ts__synstructure-0.13.2//:synstructure",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
index 1f22bb4dc29c..2d416230e0c1 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zerovec-derive-0.11.1.bazel
@@ -90,8 +90,8 @@ rust_proc_macro(
     }),
     version = "0.11.1",
     deps = [
-        "@vendor_ts__proc-macro2-1.0.95//:proc_macro2",
+        "@vendor_ts__proc-macro2-1.0.97//:proc_macro2",
         "@vendor_ts__quote-1.0.40//:quote",
-        "@vendor_ts__syn-2.0.103//:syn",
+        "@vendor_ts__syn-2.0.104//:syn",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel
index 1d01652f12f4..0d8bdc167574 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/BUILD.zstd-sys-2.0.15+zstd.1.5.7.bazel
@@ -160,7 +160,7 @@ cargo_build_script(
     version = "2.0.15+zstd.1.5.7",
     visibility = ["//visibility:private"],
     deps = [
-        "@vendor_ts__cc-1.2.7//:cc",
+        "@vendor_ts__cc-1.2.29//:cc",
         "@vendor_ts__pkg-config-0.3.32//:pkg_config",
     ],
 )
diff --git a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
index 7f5a20358413..1ac8707748c0 100644
--- a/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
+++ b/misc/bazel/3rdparty/tree_sitter_extractors_deps/defs.bzl
@@ -295,12 +295,12 @@ def aliases(
 _NORMAL_DEPENDENCIES = {
     "ruby/extractor": {
         _COMMON_CONDITION: {
-            "clap": Label("@vendor_ts__clap-4.5.40//:clap"),
+            "clap": Label("@vendor_ts__clap-4.5.44//: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"),
-            "serde_json": Label("@vendor_ts__serde_json-1.0.140//:serde_json"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.142//: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"),
@@ -310,14 +310,14 @@ _NORMAL_DEPENDENCIES = {
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.98//:anyhow"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.99//: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.95//:proc_macro2"),
+            "proc-macro2": Label("@vendor_ts__proc-macro2-1.0.97//: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.288//:ra_ap_stdx"),
+            "stdx": Label("@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx"),
             "ungrammar": Label("@vendor_ts__ungrammar-1.16.1//:ungrammar"),
         },
     },
@@ -325,36 +325,36 @@ _NORMAL_DEPENDENCIES = {
     },
     "rust/extractor": {
         _COMMON_CONDITION: {
-            "anyhow": Label("@vendor_ts__anyhow-1.0.98//:anyhow"),
+            "anyhow": Label("@vendor_ts__anyhow-1.0.99//:anyhow"),
             "argfile": Label("@vendor_ts__argfile-0.2.1//:argfile"),
-            "chalk-ir": Label("@vendor_ts__chalk-ir-0.103.0//:chalk_ir"),
+            "chalk-ir": Label("@vendor_ts__chalk-ir-0.104.0//:chalk_ir"),
             "chrono": Label("@vendor_ts__chrono-0.4.41//:chrono"),
-            "clap": Label("@vendor_ts__clap-4.5.40//:clap"),
+            "clap": Label("@vendor_ts__clap-4.5.44//: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"),
+            "glob": Label("@vendor_ts__glob-0.3.3//:glob"),
             "itertools": Label("@vendor_ts__itertools-0.14.0//:itertools"),
             "mustache": Label("@vendor_ts__mustache-0.9.0//:mustache"),
             "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.288//:ra_ap_base_db"),
-            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.288//:ra_ap_cfg"),
-            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.288//:ra_ap_hir"),
-            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.288//:ra_ap_hir_def"),
-            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.288//:ra_ap_hir_expand"),
-            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.288//:ra_ap_hir_ty"),
-            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.288//:ra_ap_ide_db"),
-            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.288//:ra_ap_intern"),
-            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.288//:ra_ap_load_cargo"),
-            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.288//:ra_ap_parser"),
-            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.288//:ra_ap_paths"),
-            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.288//:ra_ap_project_model"),
-            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.288//:ra_ap_span"),
-            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.288//:ra_ap_syntax"),
-            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.288//:ra_ap_vfs"),
+            "ra_ap_base_db": Label("@vendor_ts__ra_ap_base_db-0.0.300//:ra_ap_base_db"),
+            "ra_ap_cfg": Label("@vendor_ts__ra_ap_cfg-0.0.300//:ra_ap_cfg"),
+            "ra_ap_hir": Label("@vendor_ts__ra_ap_hir-0.0.300//:ra_ap_hir"),
+            "ra_ap_hir_def": Label("@vendor_ts__ra_ap_hir_def-0.0.300//:ra_ap_hir_def"),
+            "ra_ap_hir_expand": Label("@vendor_ts__ra_ap_hir_expand-0.0.300//:ra_ap_hir_expand"),
+            "ra_ap_hir_ty": Label("@vendor_ts__ra_ap_hir_ty-0.0.300//:ra_ap_hir_ty"),
+            "ra_ap_ide_db": Label("@vendor_ts__ra_ap_ide_db-0.0.300//:ra_ap_ide_db"),
+            "ra_ap_intern": Label("@vendor_ts__ra_ap_intern-0.0.300//:ra_ap_intern"),
+            "ra_ap_load-cargo": Label("@vendor_ts__ra_ap_load-cargo-0.0.300//:ra_ap_load_cargo"),
+            "ra_ap_parser": Label("@vendor_ts__ra_ap_parser-0.0.300//:ra_ap_parser"),
+            "ra_ap_paths": Label("@vendor_ts__ra_ap_paths-0.0.300//:ra_ap_paths"),
+            "ra_ap_project_model": Label("@vendor_ts__ra_ap_project_model-0.0.300//:ra_ap_project_model"),
+            "ra_ap_span": Label("@vendor_ts__ra_ap_span-0.0.300//:ra_ap_span"),
+            "ra_ap_syntax": Label("@vendor_ts__ra_ap_syntax-0.0.300//:ra_ap_syntax"),
+            "ra_ap_vfs": Label("@vendor_ts__ra_ap_vfs-0.0.300//: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.13.0//:serde_with"),
-            "toml": Label("@vendor_ts__toml-0.8.23//:toml"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.142//:serde_json"),
+            "serde_with": Label("@vendor_ts__serde_with-3.14.0//:serde_with"),
+            "toml": Label("@vendor_ts__toml-0.9.5//: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"),
@@ -364,7 +364,7 @@ _NORMAL_DEPENDENCIES = {
     "rust/extractor/macros": {
         _COMMON_CONDITION: {
             "quote": Label("@vendor_ts__quote-1.0.40//:quote"),
-            "syn": Label("@vendor_ts__syn-2.0.103//:syn"),
+            "syn": Label("@vendor_ts__syn-2.0.104//:syn"),
         },
     },
     "shared/tree-sitter-extractor": {
@@ -378,7 +378,7 @@ _NORMAL_DEPENDENCIES = {
             "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"),
+            "serde_json": Label("@vendor_ts__serde_json-1.0.142//: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"),
@@ -394,7 +394,7 @@ _NORMAL_ALIASES = {
     },
     "rust/ast-generator": {
         _COMMON_CONDITION: {
-            Label("@vendor_ts__ra_ap_stdx-0.0.288//:ra_ap_stdx"): "stdx",
+            Label("@vendor_ts__ra_ap_stdx-0.0.300//:ra_ap_stdx"): "stdx",
         },
     },
     "rust/autobuild": {
@@ -426,7 +426,7 @@ _NORMAL_DEV_DEPENDENCIES = {
     },
     "shared/tree-sitter-extractor": {
         _COMMON_CONDITION: {
-            "rand": Label("@vendor_ts__rand-0.9.1//:rand"),
+            "rand": Label("@vendor_ts__rand-0.9.2//: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"),
         },
@@ -588,7 +588,7 @@ _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(any(target_os = \"linux\", target_os = \"android\"), not(any(all(target_os = \"linux\", target_env = \"\"), getrandom_backend = \"custom\", getrandom_backend = \"linux_raw\", 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\"))": [],
@@ -599,14 +599,13 @@ _CONDITIONS = {
     "cfg(all(target_arch = \"x86_64\", target_env = \"msvc\", not(windows_raw_dylib)))": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
     "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(target_os = \"linux\", target_env = \"gnu\"))": ["@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(all(target_os = \"uefi\", getrandom_backend = \"efi_rng\"))": [],
     "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 = \"dragonfly\", target_os = \"freebsd\", target_os = \"hurd\", target_os = \"illumos\", target_os = \"cygwin\", 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(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"],
@@ -620,6 +619,7 @@ _CONDITIONS = {
     "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(target_vendor = \"apple\")": ["@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(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"],
     "cfg(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"],
     "i686-apple-darwin": ["@rules_rust//rust/platform:i686-apple-darwin"],
@@ -711,62 +711,62 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstream-0.6.18",
-        sha256 = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b",
+        name = "vendor_ts__anstream-0.6.19",
+        sha256 = "301af1932e46185686725e0fad2f8f2aa7da69dd70bf6ecc44d6b703844a3933",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstream/0.6.18/download"],
-        strip_prefix = "anstream-0.6.18",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.18.bazel"),
+        urls = ["https://static.crates.io/crates/anstream/0.6.19/download"],
+        strip_prefix = "anstream-0.6.19",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstream-0.6.19.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-1.0.10",
-        sha256 = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9",
+        name = "vendor_ts__anstyle-1.0.11",
+        sha256 = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle/1.0.10/download"],
-        strip_prefix = "anstyle-1.0.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.10.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle/1.0.11/download"],
+        strip_prefix = "anstyle-1.0.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-1.0.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-parse-0.2.6",
-        sha256 = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9",
+        name = "vendor_ts__anstyle-parse-0.2.7",
+        sha256 = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.6/download"],
-        strip_prefix = "anstyle-parse-0.2.6",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.6.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-parse/0.2.7/download"],
+        strip_prefix = "anstyle-parse-0.2.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-parse-0.2.7.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-query-1.1.2",
-        sha256 = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c",
+        name = "vendor_ts__anstyle-query-1.1.3",
+        sha256 = "6c8bdeb6047d8983be085bab0ba1472e6dc604e7041dbf6fcd5e71523014fae9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anstyle-query/1.1.2/download"],
-        strip_prefix = "anstyle-query-1.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.2.bazel"),
+        urls = ["https://static.crates.io/crates/anstyle-query/1.1.3/download"],
+        strip_prefix = "anstyle-query-1.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-query-1.1.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anstyle-wincon-3.0.7",
-        sha256 = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e",
+        name = "vendor_ts__anstyle-wincon-3.0.9",
+        sha256 = "403f75924867bb1033c59fbf0797484329750cfbe3c4325cd33127941fabc882",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/anstyle-wincon/3.0.9/download"],
+        strip_prefix = "anstyle-wincon-3.0.9",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anstyle-wincon-3.0.9.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__anyhow-1.0.98",
-        sha256 = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487",
+        name = "vendor_ts__anyhow-1.0.99",
+        sha256 = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/anyhow/1.0.98/download"],
-        strip_prefix = "anyhow-1.0.98",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.98.bazel"),
+        urls = ["https://static.crates.io/crates/anyhow/1.0.99/download"],
+        strip_prefix = "anyhow-1.0.99",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.anyhow-1.0.99.bazel"),
     )
 
     maybe(
@@ -801,12 +801,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__autocfg-1.4.0",
-        sha256 = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26",
+        name = "vendor_ts__autocfg-1.5.0",
+        sha256 = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/autocfg/1.4.0/download"],
-        strip_prefix = "autocfg-1.4.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.4.0.bazel"),
+        urls = ["https://static.crates.io/crates/autocfg/1.5.0/download"],
+        strip_prefix = "autocfg-1.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.autocfg-1.5.0.bazel"),
     )
 
     maybe(
@@ -841,12 +841,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__borsh-1.5.5",
-        sha256 = "5430e3be710b68d984d1391c854eb431a9d548640711faa54eecb1df93db91cc",
+        name = "vendor_ts__borsh-1.5.7",
+        sha256 = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/borsh/1.5.5/download"],
-        strip_prefix = "borsh-1.5.5",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.5.5.bazel"),
+        urls = ["https://static.crates.io/crates/borsh/1.5.7/download"],
+        strip_prefix = "borsh-1.5.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.borsh-1.5.7.bazel"),
     )
 
     maybe(
@@ -871,12 +871,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__bumpalo-3.16.0",
-        sha256 = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c",
+        name = "vendor_ts__bumpalo-3.19.0",
+        sha256 = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/bumpalo/3.16.0/download"],
-        strip_prefix = "bumpalo-3.16.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.16.0.bazel"),
+        urls = ["https://static.crates.io/crates/bumpalo/3.19.0/download"],
+        strip_prefix = "bumpalo-3.19.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bumpalo-3.19.0.bazel"),
     )
 
     maybe(
@@ -889,16 +889,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.bytemuck-1.21.0.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__byteorder-1.5.0",
-        sha256 = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/byteorder/1.5.0/download"],
-        strip_prefix = "byteorder-1.5.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.byteorder-1.5.0.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__camino-1.1.10",
@@ -921,32 +911,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__cargo-util-schemas-0.2.0",
-        sha256 = "e63d2780ac94487eb9f1fea7b0d56300abc9eb488800854ca217f102f5caccca",
+        name = "vendor_ts__cargo-util-schemas-0.8.2",
+        sha256 = "7dc1a6f7b5651af85774ae5a34b4e8be397d9cf4bc063b7e6dbd99a841837830",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo-util-schemas/0.2.0/download"],
-        strip_prefix = "cargo-util-schemas-0.2.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-util-schemas-0.2.0.bazel"),
+        urls = ["https://static.crates.io/crates/cargo-util-schemas/0.8.2/download"],
+        strip_prefix = "cargo-util-schemas-0.8.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo-util-schemas-0.8.2.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__cargo_metadata-0.20.0",
-        sha256 = "4f7835cfc6135093070e95eb2b53e5d9b5c403dc3a6be6040ee026270aa82502",
+        name = "vendor_ts__cargo_metadata-0.21.0",
+        sha256 = "5cfca2aaa699835ba88faf58a06342a314a950d2b9686165e038286c30316868",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cargo_metadata/0.20.0/download"],
-        strip_prefix = "cargo_metadata-0.20.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.20.0.bazel"),
+        urls = ["https://static.crates.io/crates/cargo_metadata/0.21.0/download"],
+        strip_prefix = "cargo_metadata-0.21.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cargo_metadata-0.21.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__cc-1.2.7",
-        sha256 = "a012a0df96dd6d06ba9a1b29d6402d1a5d77c6befd2566afdc26e10603dc93d7",
+        name = "vendor_ts__cc-1.2.29",
+        sha256 = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/cc/1.2.7/download"],
-        strip_prefix = "cc-1.2.7",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.2.7.bazel"),
+        urls = ["https://static.crates.io/crates/cc/1.2.29/download"],
+        strip_prefix = "cc-1.2.29",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.cc-1.2.29.bazel"),
     )
 
     maybe(
@@ -979,6 +969,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.103.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-derive-0.104.0",
+        sha256 = "9ea9b1e80910f66ae87c772247591432032ef3f6a67367ff17f8343db05beafa",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-derive/0.104.0/download"],
+        strip_prefix = "chalk-derive-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-derive-0.104.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__chalk-ir-0.103.0",
@@ -989,6 +989,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.103.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__chalk-ir-0.104.0",
+        sha256 = "7047a516de16226cd17344d41a319d0ea1064bf9e60bd612ab341ab4a34bbfa8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/chalk-ir/0.104.0/download"],
+        strip_prefix = "chalk-ir-0.104.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.chalk-ir-0.104.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__chalk-recursive-0.103.0",
@@ -1021,52 +1031,52 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap-4.5.40",
-        sha256 = "40b6887a1d8685cebccf115538db5c0efe625ccac9696ad45c409d96566e910f",
+        name = "vendor_ts__clap-4.5.44",
+        sha256 = "1c1f056bae57e3e54c3375c41ff79619ddd13460a17d7438712bd0d83fda4ff8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap/4.5.40/download"],
-        strip_prefix = "clap-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap/4.5.44/download"],
+        strip_prefix = "clap-4.5.44",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap-4.5.44.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_builder-4.5.40",
-        sha256 = "e0c66c08ce9f0c698cbce5c0279d0bb6ac936d8674174fe48f736533b964f59e",
+        name = "vendor_ts__clap_builder-4.5.44",
+        sha256 = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_builder/4.5.40/download"],
-        strip_prefix = "clap_builder-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap_builder/4.5.44/download"],
+        strip_prefix = "clap_builder-4.5.44",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_builder-4.5.44.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_derive-4.5.40",
-        sha256 = "d2c7947ae4cc3d851207c1adb5b5e260ff0cca11446b1d6d1423788e442257ce",
+        name = "vendor_ts__clap_derive-4.5.41",
+        sha256 = "ef4f52386a59ca4c860f7393bcf8abd8dfd91ecccc0f774635ff68e92eeef491",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_derive/4.5.40/download"],
-        strip_prefix = "clap_derive-4.5.40",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.40.bazel"),
+        urls = ["https://static.crates.io/crates/clap_derive/4.5.41/download"],
+        strip_prefix = "clap_derive-4.5.41",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_derive-4.5.41.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__clap_lex-0.7.4",
-        sha256 = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6",
+        name = "vendor_ts__clap_lex-0.7.5",
+        sha256 = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/clap_lex/0.7.4/download"],
-        strip_prefix = "clap_lex-0.7.4",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.4.bazel"),
+        urls = ["https://static.crates.io/crates/clap_lex/0.7.5/download"],
+        strip_prefix = "clap_lex-0.7.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.clap_lex-0.7.5.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__colorchoice-1.0.3",
-        sha256 = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990",
+        name = "vendor_ts__colorchoice-1.0.4",
+        sha256 = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/colorchoice/1.0.3/download"],
-        strip_prefix = "colorchoice-1.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.3.bazel"),
+        urls = ["https://static.crates.io/crates/colorchoice/1.0.4/download"],
+        strip_prefix = "colorchoice-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.colorchoice-1.0.4.bazel"),
     )
 
     maybe(
@@ -1161,32 +1171,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling-0.20.10",
-        sha256 = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989",
+        name = "vendor_ts__darling-0.20.11",
+        sha256 = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling/0.20.10/download"],
-        strip_prefix = "darling-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling/0.20.11/download"],
+        strip_prefix = "darling-0.20.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling-0.20.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling_core-0.20.10",
-        sha256 = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5",
+        name = "vendor_ts__darling_core-0.20.11",
+        sha256 = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_core/0.20.10/download"],
-        strip_prefix = "darling_core-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling_core/0.20.11/download"],
+        strip_prefix = "darling_core-0.20.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_core-0.20.11.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__darling_macro-0.20.10",
-        sha256 = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806",
+        name = "vendor_ts__darling_macro-0.20.11",
+        sha256 = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/darling_macro/0.20.10/download"],
-        strip_prefix = "darling_macro-0.20.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.20.10.bazel"),
+        urls = ["https://static.crates.io/crates/darling_macro/0.20.11/download"],
+        strip_prefix = "darling_macro-0.20.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.darling_macro-0.20.11.bazel"),
     )
 
     maybe(
@@ -1201,12 +1211,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__deranged-0.3.11",
-        sha256 = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4",
+        name = "vendor_ts__deranged-0.4.0",
+        sha256 = "9c9e6a11ca8224451684bc0d7d5a7adbf8f2fd6887261a1cfc3c0432f9d4068e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/deranged/0.3.11/download"],
-        strip_prefix = "deranged-0.3.11",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.3.11.bazel"),
+        urls = ["https://static.crates.io/crates/deranged/0.4.0/download"],
+        strip_prefix = "deranged-0.4.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.deranged-0.4.0.bazel"),
     )
 
     maybe(
@@ -1461,22 +1471,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__getrandom-0.3.1",
-        sha256 = "43a49c392881ce6d5c3b8cb70f98717b7c07aabbdff06687b9030dbfbe2725f8",
+        name = "vendor_ts__getrandom-0.3.3",
+        sha256 = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/getrandom/0.3.3/download"],
+        strip_prefix = "getrandom-0.3.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.getrandom-0.3.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__glob-0.3.2",
-        sha256 = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2",
+        name = "vendor_ts__glob-0.3.3",
+        sha256 = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/glob/0.3.2/download"],
-        strip_prefix = "glob-0.3.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.2.bazel"),
+        urls = ["https://static.crates.io/crates/glob/0.3.3/download"],
+        strip_prefix = "glob-0.3.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.glob-0.3.3.bazel"),
     )
 
     maybe(
@@ -1511,12 +1521,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__hashbrown-0.15.2",
-        sha256 = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289",
+        name = "vendor_ts__hashbrown-0.15.4",
+        sha256 = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/hashbrown/0.15.2/download"],
-        strip_prefix = "hashbrown-0.15.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.2.bazel"),
+        urls = ["https://static.crates.io/crates/hashbrown/0.15.4/download"],
+        strip_prefix = "hashbrown-0.15.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.hashbrown-0.15.4.bazel"),
     )
 
     maybe(
@@ -1571,12 +1581,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__iana-time-zone-0.1.61",
-        sha256 = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220",
+        name = "vendor_ts__iana-time-zone-0.1.63",
+        sha256 = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.61/download"],
-        strip_prefix = "iana-time-zone-0.1.61",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.61.bazel"),
+        urls = ["https://static.crates.io/crates/iana-time-zone/0.1.63/download"],
+        strip_prefix = "iana-time-zone-0.1.63",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.iana-time-zone-0.1.63.bazel"),
     )
 
     maybe(
@@ -1701,12 +1711,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__indexmap-2.9.0",
-        sha256 = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e",
+        name = "vendor_ts__indexmap-2.10.0",
+        sha256 = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/indexmap/2.9.0/download"],
-        strip_prefix = "indexmap-2.9.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.9.0.bazel"),
+        urls = ["https://static.crates.io/crates/indexmap/2.10.0/download"],
+        strip_prefix = "indexmap-2.10.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.indexmap-2.10.0.bazel"),
     )
 
     maybe(
@@ -1739,6 +1749,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.inotify-sys-0.1.5.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__intrusive-collections-0.9.7",
+        sha256 = "189d0897e4cbe8c75efedf3502c18c887b05046e59d28404d4d8e46cbc4d1e86",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/intrusive-collections/0.9.7/download"],
+        strip_prefix = "intrusive-collections-0.9.7",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.intrusive-collections-0.9.7.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__is_terminal_polyfill-1.70.1",
@@ -1801,22 +1821,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__js-sys-0.3.76",
-        sha256 = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7",
+        name = "vendor_ts__js-sys-0.3.77",
+        sha256 = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/js-sys/0.3.76/download"],
-        strip_prefix = "js-sys-0.3.76",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.76.bazel"),
+        urls = ["https://static.crates.io/crates/js-sys/0.3.77/download"],
+        strip_prefix = "js-sys-0.3.77",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.js-sys-0.3.77.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__kqueue-1.0.8",
-        sha256 = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c",
+        name = "vendor_ts__kqueue-1.1.1",
+        sha256 = "eac30106d7dce88daf4a3fcb4879ea939476d5074a9b7ddd0fb97fa4bed5596a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/kqueue/1.0.8/download"],
-        strip_prefix = "kqueue-1.0.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.0.8.bazel"),
+        urls = ["https://static.crates.io/crates/kqueue/1.1.1/download"],
+        strip_prefix = "kqueue-1.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.kqueue-1.1.1.bazel"),
     )
 
     maybe(
@@ -1861,12 +1881,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__libredox-0.1.3",
-        sha256 = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d",
+        name = "vendor_ts__libredox-0.1.4",
+        sha256 = "1580801010e535496706ba011c15f8532df6b42297d2e471fec38ceadd8c0638",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/libredox/0.1.3/download"],
-        strip_prefix = "libredox-0.1.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libredox-0.1.3.bazel"),
+        urls = ["https://static.crates.io/crates/libredox/0.1.4/download"],
+        strip_prefix = "libredox-0.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.libredox-0.1.4.bazel"),
     )
 
     maybe(
@@ -1891,12 +1911,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__lock_api-0.4.12",
-        sha256 = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17",
+        name = "vendor_ts__lock_api-0.4.13",
+        sha256 = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/lock_api/0.4.12/download"],
-        strip_prefix = "lock_api-0.4.12",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.12.bazel"),
+        urls = ["https://static.crates.io/crates/lock_api/0.4.13/download"],
+        strip_prefix = "lock_api-0.4.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.lock_api-0.4.13.bazel"),
     )
 
     maybe(
@@ -1961,12 +1981,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__mio-1.0.3",
-        sha256 = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd",
+        name = "vendor_ts__mio-1.0.4",
+        sha256 = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/mio/1.0.4/download"],
+        strip_prefix = "mio-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.mio-1.0.4.bazel"),
     )
 
     maybe(
@@ -2061,12 +2081,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__once_cell-1.20.3",
-        sha256 = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e",
+        name = "vendor_ts__once_cell-1.21.3",
+        sha256 = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/once_cell/1.21.3/download"],
+        strip_prefix = "once_cell-1.21.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell-1.21.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__once_cell_polyfill-1.70.1",
+        sha256 = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/once_cell_polyfill/1.70.1/download"],
+        strip_prefix = "once_cell_polyfill-1.70.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.once_cell_polyfill-1.70.1.bazel"),
     )
 
     maybe(
@@ -2111,22 +2141,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__parking_lot-0.12.3",
-        sha256 = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27",
+        name = "vendor_ts__papaya-0.2.3",
+        sha256 = "f92dd0b07c53a0a0c764db2ace8c541dc47320dad97c2200c2a637ab9dd2328f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot/0.12.3/download"],
-        strip_prefix = "parking_lot-0.12.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.3.bazel"),
+        urls = ["https://static.crates.io/crates/papaya/0.2.3/download"],
+        strip_prefix = "papaya-0.2.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.papaya-0.2.3.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__parking_lot_core-0.9.10",
-        sha256 = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8",
+        name = "vendor_ts__parking_lot-0.12.4",
+        sha256 = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.10/download"],
-        strip_prefix = "parking_lot_core-0.9.10",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.10.bazel"),
+        urls = ["https://static.crates.io/crates/parking_lot/0.12.4/download"],
+        strip_prefix = "parking_lot-0.12.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot-0.12.4.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__parking_lot_core-0.9.11",
+        sha256 = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/parking_lot_core/0.9.11/download"],
+        strip_prefix = "parking_lot_core-0.9.11",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.parking_lot_core-0.9.11.bazel"),
     )
 
     maybe(
@@ -2211,12 +2251,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__portable-atomic-1.11.0",
-        sha256 = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e",
+        name = "vendor_ts__portable-atomic-1.11.1",
+        sha256 = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483",
         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"),
+        urls = ["https://static.crates.io/crates/portable-atomic/1.11.1/download"],
+        strip_prefix = "portable-atomic-1.11.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.portable-atomic-1.11.1.bazel"),
     )
 
     maybe(
@@ -2241,22 +2281,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__ppv-lite86-0.2.20",
-        sha256 = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04",
+        name = "vendor_ts__ppv-lite86-0.2.21",
+        sha256 = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.20/download"],
-        strip_prefix = "ppv-lite86-0.2.20",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.20.bazel"),
+        urls = ["https://static.crates.io/crates/ppv-lite86/0.2.21/download"],
+        strip_prefix = "ppv-lite86-0.2.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ppv-lite86-0.2.21.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__proc-macro2-1.0.95",
-        sha256 = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778",
+        name = "vendor_ts__proc-macro2-1.0.97",
+        sha256 = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/proc-macro2/1.0.95/download"],
-        strip_prefix = "proc-macro2-1.0.95",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.95.bazel"),
+        urls = ["https://static.crates.io/crates/proc-macro2/1.0.97/download"],
+        strip_prefix = "proc-macro2-1.0.97",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.proc-macro2-1.0.97.bazel"),
     )
 
     maybe(
@@ -2281,332 +2321,352 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_abi-0.116.0",
-        sha256 = "a967e3a9cd3e38b543f503978e0eccee461e3aea3f7b10e944959bff41dbe612",
+        name = "vendor_ts__r-efi-5.3.0",
+        sha256 = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_abi-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/r-efi/5.3.0/download"],
+        strip_prefix = "r-efi-5.3.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.r-efi-5.3.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_hashes-0.116.0",
-        sha256 = "1ea4c755ecbbffa5743c251344f484ebe571ec7bc5b36d80b2a8ae775d1a7a40",
+        name = "vendor_ts__ra-ap-rustc_abi-0.123.0",
+        sha256 = "f18c877575c259d127072e9bfc41d985202262fb4d6bfdae3d1252147c2562c2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_hashes-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_abi/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_abi-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_abi-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_index-0.116.0",
-        sha256 = "aca7ad7cf911538c619caa2162339fe98637e9e46f11bb0484ef96735df4d64a",
+        name = "vendor_ts__ra-ap-rustc_hashes-0.123.0",
+        sha256 = "2439ed1df3472443133b66949f81080dff88089b42f825761455463709ee1cad",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_index-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_hashes/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_hashes-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_hashes-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_index_macros-0.116.0",
-        sha256 = "8767ba551c9355bc3031be072cc4bb0381106e5e7cd275e72b7a8c76051c4070",
+        name = "vendor_ts__ra-ap-rustc_index-0.123.0",
+        sha256 = "57a24fe0be21be1f8ebc21dcb40129214fb4cefb0f2753f3d46b6dbe656a1a45",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_index_macros-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_index-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_lexer-0.116.0",
-        sha256 = "6101374afb267e6c27e4e2eb0b1352e9f3504c1a8f716f619cd39244e2ed92ab",
+        name = "vendor_ts__ra-ap-rustc_index_macros-0.123.0",
+        sha256 = "844a27ddcad0116facae2df8e741fd788662cf93dc13029cd864f2b8013b81f9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_lexer-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_index_macros/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_index_macros-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_index_macros-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_parse_format-0.116.0",
-        sha256 = "ecd88a19f00da4f43e6727d5013444cbc399804b5046dfa2bbcd28ebed3970ce",
+        name = "vendor_ts__ra-ap-rustc_lexer-0.121.0",
+        sha256 = "22944e31fb91e9b3e75bcbc91e37d958b8c0825a6160927f2856831d2ce83b36",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_parse_format-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.121.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.121.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.121.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.116.0",
-        sha256 = "bb332dd32d7850a799862533b1c021e6062558861a4ad57817bf522499fbb892",
+        name = "vendor_ts__ra-ap-rustc_lexer-0.123.0",
+        sha256 = "2b734cfcb577d09877799a22742f1bd398be6c00bc428d9de56d48d11ece5771",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.116.0/download"],
-        strip_prefix = "ra-ap-rustc_pattern_analysis-0.116.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.116.0.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_lexer/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_lexer-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_lexer-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_base_db-0.0.288",
-        sha256 = "edf27fccb119fe85faf51f51847df9695d3cca30c2427fed9b4d71e6adebb54f",
+        name = "vendor_ts__ra-ap-rustc_parse_format-0.121.0",
+        sha256 = "81057891bc2063ad9e353f29462fbc47a0f5072560af34428ae9313aaa5e9d97",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.288/download"],
-        strip_prefix = "ra_ap_base_db-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_parse_format/0.121.0/download"],
+        strip_prefix = "ra-ap-rustc_parse_format-0.121.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_parse_format-0.121.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_cfg-0.0.288",
-        sha256 = "3cea86a5d6e84fd73824c26f52442807af911db038db821124b2ac65fac24209",
+        name = "vendor_ts__ra-ap-rustc_pattern_analysis-0.123.0",
+        sha256 = "75b0ee1f059b9dea0818c6c7267478926eee95ba4c7dcf89c8db32fa165d3904",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.288/download"],
-        strip_prefix = "ra_ap_cfg-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra-ap-rustc_pattern_analysis/0.123.0/download"],
+        strip_prefix = "ra-ap-rustc_pattern_analysis-0.123.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra-ap-rustc_pattern_analysis-0.123.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_edition-0.0.288",
-        sha256 = "fb5538d534eeb8526071610664dc64b71ca336b78f6933ff7241d10c1f37e91b",
+        name = "vendor_ts__ra_ap_base_db-0.0.300",
+        sha256 = "47cac371778785196064f1a347fbbac0aafb1053786f17378bb138be59e57fc2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.288/download"],
-        strip_prefix = "ra_ap_edition-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_base_db/0.0.300/download"],
+        strip_prefix = "ra_ap_base_db-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_base_db-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir-0.0.288",
-        sha256 = "44796828650900565917ddcc944fecdf6c7d5c3a8a31141f17268ea8c1d2e6f0",
+        name = "vendor_ts__ra_ap_cfg-0.0.300",
+        sha256 = "6789ed14467e6625bef45b29555844d0168d8af1bea9edb0f1d44f0a9b69f398",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.288/download"],
-        strip_prefix = "ra_ap_hir-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_cfg/0.0.300/download"],
+        strip_prefix = "ra_ap_cfg-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_cfg-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_def-0.0.288",
-        sha256 = "8949b2fb362a1e4eab4d90c7299f0fad3f2c887d9f7d9c286ac6530da4141f85",
+        name = "vendor_ts__ra_ap_edition-0.0.300",
+        sha256 = "637b74c692dc9d9b44394f8c0f91c063e1b6223c6e54f4ee89c943db2f2ee26e",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_def-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_edition/0.0.300/download"],
+        strip_prefix = "ra_ap_edition-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_edition-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_expand-0.0.288",
-        sha256 = "22457a431b5eeb67517e03266fddefe48839b060a674a6b18bd84269012ede1e",
+        name = "vendor_ts__ra_ap_hir-0.0.300",
+        sha256 = "a94c69a3830f0b6fbc36c1d098fcc9430f63c8d47ee6f93e3d6810c3bf440296",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_expand-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir/0.0.300/download"],
+        strip_prefix = "ra_ap_hir-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_hir_ty-0.0.288",
-        sha256 = "3a4b7a7531414203e11ae447627e2909250eff392c06278ab53ae2a022ecc9fc",
+        name = "vendor_ts__ra_ap_hir_def-0.0.300",
+        sha256 = "7d94fcf7743db2f4f7e2c2911563847eb8efe2b7fb9fa430c107f0ac05962254",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.288/download"],
-        strip_prefix = "ra_ap_hir_ty-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_def/0.0.300/download"],
+        strip_prefix = "ra_ap_hir_def-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_def-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_ide_db-0.0.288",
-        sha256 = "77741ceb096d4f5ecf5384210ea5a2b46878125047c6b0df2bdcfac08a20ea0c",
+        name = "vendor_ts__ra_ap_hir_expand-0.0.300",
+        sha256 = "67ea3f6a0ba0c1e8b63f4a41bc596c07aeb2db2f99b67fa077820cfb5fce58bd",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.288/download"],
-        strip_prefix = "ra_ap_ide_db-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_expand/0.0.300/download"],
+        strip_prefix = "ra_ap_hir_expand-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_expand-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_intern-0.0.288",
-        sha256 = "4a1872cd5a425db6d5247a7deca11526e3104757f6732447ac6ee93c3e795725",
+        name = "vendor_ts__ra_ap_hir_ty-0.0.300",
+        sha256 = "eccf6c291a88892e59e7591e081da8b9158f8c0b1ed9cb9b73d02d29a0d3d6d9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.288/download"],
-        strip_prefix = "ra_ap_intern-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_hir_ty/0.0.300/download"],
+        strip_prefix = "ra_ap_hir_ty-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_hir_ty-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_load-cargo-0.0.288",
-        sha256 = "f30f5433f056594b02f1879c5c2ce76ea9fd395f21e2a55df6ce3229db993caa",
+        name = "vendor_ts__ra_ap_ide_db-0.0.300",
+        sha256 = "0bbbc97cc9837f91100711b65fb0d8ce9d7ed8da0dc418e08678d973d53da6a3",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.288/download"],
-        strip_prefix = "ra_ap_load-cargo-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_ide_db/0.0.300/download"],
+        strip_prefix = "ra_ap_ide_db-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_ide_db-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_mbe-0.0.288",
-        sha256 = "222a993acaec35e90c08357aecd530b7170cc3a7f13b3ddfd15a200029ccd555",
+        name = "vendor_ts__ra_ap_intern-0.0.300",
+        sha256 = "10f4785a674a41f9f52414fb7f19ab9a1d6886cad572e68721a883b0b85c256b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.288/download"],
-        strip_prefix = "ra_ap_mbe-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_intern/0.0.300/download"],
+        strip_prefix = "ra_ap_intern-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_intern-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_parser-0.0.288",
-        sha256 = "1c5693f5efd27832e1ac572ea756a1a4a3f7eba07f1287268ca111710971c2e5",
+        name = "vendor_ts__ra_ap_load-cargo-0.0.300",
+        sha256 = "f3be9990782fd2c2d90b67e2e0b4a86e7412ec8a0719950d9a68292924e85691",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.288/download"],
-        strip_prefix = "ra_ap_parser-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_load-cargo/0.0.300/download"],
+        strip_prefix = "ra_ap_load-cargo-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_load-cargo-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_paths-0.0.288",
-        sha256 = "39418eff64e59d4bf90dd825ac7d242576e9554669824ebc55a6628bde0aaf10",
+        name = "vendor_ts__ra_ap_mbe-0.0.300",
+        sha256 = "5b713f4d927f9d86391f66237019b8e5dbcad4ddbbe37c91c2e21adca258b9aa",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.288/download"],
-        strip_prefix = "ra_ap_paths-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_mbe/0.0.300/download"],
+        strip_prefix = "ra_ap_mbe-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_mbe-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_proc_macro_api-0.0.288",
-        sha256 = "14a315af8c4a9379c26abe7baa143d62e3975ff26f27c65332f9a5edccc56d38",
+        name = "vendor_ts__ra_ap_parser-0.0.300",
+        sha256 = "0d3fb8a5891c1c1d6fba5e58caa86b88f831990c878e361c54c1c1ff44ca8401",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.288/download"],
-        strip_prefix = "ra_ap_proc_macro_api-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_parser/0.0.300/download"],
+        strip_prefix = "ra_ap_parser-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_parser-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_profile-0.0.288",
-        sha256 = "08274a0adbf8255f8b2672302452e31bbb2ed4d38324da9c72a7bf9cf1428483",
+        name = "vendor_ts__ra_ap_paths-0.0.300",
+        sha256 = "9ccd5cfd0dae89ab2c70c4e5aa646f64bb8b5591622477342863c23a5f32dabc",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.288/download"],
-        strip_prefix = "ra_ap_profile-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_paths/0.0.300/download"],
+        strip_prefix = "ra_ap_paths-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_paths-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_project_model-0.0.288",
-        sha256 = "33deecb3724faf91f13b0f1b5115af7c4f5c9dc1dfbbf45f55261aa28f874838",
+        name = "vendor_ts__ra_ap_proc_macro_api-0.0.300",
+        sha256 = "dae43c707bfb78f1b841ffb3731cc7876550463306c3b3986c20abd31033e7a2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.288/download"],
-        strip_prefix = "ra_ap_project_model-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_proc_macro_api/0.0.300/download"],
+        strip_prefix = "ra_ap_proc_macro_api-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_proc_macro_api-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_query-group-macro-0.0.288",
-        sha256 = "5fdefdc9c8d6fd7d85ac572649378e83266262e09400bfdb7c8a7407d3cc2a3e",
+        name = "vendor_ts__ra_ap_profile-0.0.300",
+        sha256 = "95a7b93ca94cf0821e8bcac6bf8464cc94d7b3cbe63ffb74946a58ad03991fae",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.288/download"],
-        strip_prefix = "ra_ap_query-group-macro-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_profile/0.0.300/download"],
+        strip_prefix = "ra_ap_profile-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_profile-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_span-0.0.288",
-        sha256 = "c20071c89e1f7dd63c803130634f4bb6ce7783dc0e7ff90839d1d0f4e625b7a8",
+        name = "vendor_ts__ra_ap_project_model-0.0.300",
+        sha256 = "0751b9433a0dd49c6ae58c9572faf9557d2b53818370d72112b3adeaae5eabc4",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.288/download"],
-        strip_prefix = "ra_ap_span-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_project_model/0.0.300/download"],
+        strip_prefix = "ra_ap_project_model-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_project_model-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_stdx-0.0.288",
-        sha256 = "552df390b26624eca7936aea1dbbb3786d7a12477e26ef917ffabba19f75ad44",
+        name = "vendor_ts__ra_ap_query-group-macro-0.0.300",
+        sha256 = "5a82732eb8f5dc592d1d8d9bee23c1d66532e39293f02e23c7a546b60b35072b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.288/download"],
-        strip_prefix = "ra_ap_stdx-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_query-group-macro/0.0.300/download"],
+        strip_prefix = "ra_ap_query-group-macro-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_query-group-macro-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_syntax-0.0.288",
-        sha256 = "a78db1a9966c0fa05446b8185da35a325680741119366c6246e4a9800f29143a",
+        name = "vendor_ts__ra_ap_span-0.0.300",
+        sha256 = "c498ddf2d71705dcef9fb142269c0027c959a5eb17c435eea5466af7c3b9c47c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.288/download"],
-        strip_prefix = "ra_ap_syntax-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_span/0.0.300/download"],
+        strip_prefix = "ra_ap_span-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_span-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_syntax-bridge-0.0.288",
-        sha256 = "e69ef7fad8598d5c9f14a375d56ec12200fa927bc805b600af419611f4642fdb",
+        name = "vendor_ts__ra_ap_stdx-0.0.300",
+        sha256 = "26ade567b0d692c7efd4ceb921cdbe182beca0b5af9a5cf05c07cf0e14db512a",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.288/download"],
-        strip_prefix = "ra_ap_syntax-bridge-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_stdx/0.0.300/download"],
+        strip_prefix = "ra_ap_stdx-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_stdx-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_toolchain-0.0.288",
-        sha256 = "628f3f190def67b1116d8bdd6ec4f6f206fada2c93b84ba71086d60c63429282",
+        name = "vendor_ts__ra_ap_syntax-0.0.300",
+        sha256 = "dba62d25b0296eb095d9db77e56d096417a89db4f4de1956add0d472ebcaf922",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.288/download"],
-        strip_prefix = "ra_ap_toolchain-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax/0.0.300/download"],
+        strip_prefix = "ra_ap_syntax-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_tt-0.0.288",
-        sha256 = "e050f4ad13df59e90e38332860304a3e85ff2fa8d4585b8cc44fc982923c82b1",
+        name = "vendor_ts__ra_ap_syntax-bridge-0.0.300",
+        sha256 = "664466f2e824e285b671366f81128aa4a91b501fedbf7956a6bfb1f13d8b0b39",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.288/download"],
-        strip_prefix = "ra_ap_tt-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_syntax-bridge/0.0.300/download"],
+        strip_prefix = "ra_ap_syntax-bridge-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_syntax-bridge-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_vfs-0.0.288",
-        sha256 = "62082190f0b3551e4d941bcaaac51a7c39c85b2e193bcc50d0807e1701da4083",
+        name = "vendor_ts__ra_ap_toolchain-0.0.300",
+        sha256 = "2ef82cfc5eb8f9d4a3be9876ce019b78fbfdb8ff4f7e4dee9e384d65122096ab",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.288/download"],
-        strip_prefix = "ra_ap_vfs-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_toolchain/0.0.300/download"],
+        strip_prefix = "ra_ap_toolchain-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_toolchain-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__ra_ap_vfs-notify-0.0.288",
-        sha256 = "efd7cfa1095b81bd1994ab70e5543c97a8733987eb0ddf390cf3ad58d4e2dc57",
+        name = "vendor_ts__ra_ap_tt-0.0.300",
+        sha256 = "cbc858f5208f0d00f8638d14ab5ffab5d1bc79ad7fe1db5c5e0d478b9a02155c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.288/download"],
-        strip_prefix = "ra_ap_vfs-notify-0.0.288",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.288.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_tt/0.0.300/download"],
+        strip_prefix = "ra_ap_tt-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_tt-0.0.300.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rand-0.9.1",
-        sha256 = "9fbfd9d094a40bf3ae768db9361049ace4c0e04a4fd6b359518bd7b73a73dd97",
+        name = "vendor_ts__ra_ap_vfs-0.0.300",
+        sha256 = "e065b27829f5281d2ffc41de72551a0e4c4f49a9989ba7721676f414100c8af2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rand/0.9.1/download"],
-        strip_prefix = "rand-0.9.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.1.bazel"),
+        urls = ["https://static.crates.io/crates/ra_ap_vfs/0.0.300/download"],
+        strip_prefix = "ra_ap_vfs-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-0.0.300.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ra_ap_vfs-notify-0.0.300",
+        sha256 = "5a3c795e86c9b5fcdbb99145e401a0d6348ed471ac96f1b7de151c0abe07a5af",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/ra_ap_vfs-notify/0.0.300/download"],
+        strip_prefix = "ra_ap_vfs-notify-0.0.300",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ra_ap_vfs-notify-0.0.300.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__rand-0.9.2",
+        sha256 = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rand/0.9.2/download"],
+        strip_prefix = "rand-0.9.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand-0.9.2.bazel"),
     )
 
     maybe(
@@ -2621,12 +2681,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__rand_core-0.9.2",
-        sha256 = "7a509b1a2ffbe92afab0e55c8fd99dea1c280e8171bd2d88682bb20bc41cbc2c",
+        name = "vendor_ts__rand_core-0.9.3",
+        sha256 = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/rand_core/0.9.3/download"],
+        strip_prefix = "rand_core-0.9.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rand_core-0.9.3.bazel"),
     )
 
     maybe(
@@ -2651,12 +2711,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__redox_syscall-0.5.8",
-        sha256 = "03a862b389f93e68874fbf580b9de08dd02facb9a788ebadaf4a3fd33cf58834",
+        name = "vendor_ts__redox_syscall-0.5.13",
+        sha256 = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/redox_syscall/0.5.8/download"],
-        strip_prefix = "redox_syscall-0.5.8",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.8.bazel"),
+        urls = ["https://static.crates.io/crates/redox_syscall/0.5.13/download"],
+        strip_prefix = "redox_syscall-0.5.13",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.redox_syscall-0.5.13.bazel"),
     )
 
     maybe(
@@ -2761,32 +2821,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__rustc-literal-escaper-0.0.2",
-        sha256 = "0041b6238913c41fe704213a4a9329e2f685a156d1781998128b4149c230ad04",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.2/download"],
-        strip_prefix = "rustc-literal-escaper-0.0.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.2.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        name = "vendor_ts__rustc-literal-escaper-0.0.3",
-        sha256 = "78744cd17f5d01c75b709e49807d1363e02a940ccee2e9e72435843fdb0d076e",
+        name = "vendor_ts__rustc-literal-escaper-0.0.4",
+        sha256 = "ab03008eb631b703dd16978282ae36c73282e7922fe101a4bd072a40ecea7b8b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.3/download"],
-        strip_prefix = "rustc-literal-escaper-0.0.3",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.3.bazel"),
+        urls = ["https://static.crates.io/crates/rustc-literal-escaper/0.0.4/download"],
+        strip_prefix = "rustc-literal-escaper-0.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-literal-escaper-0.0.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__rustc-stable-hash-0.1.1",
-        sha256 = "2febf9acc5ee5e99d1ad0afcdbccc02d87aa3f857a1f01f825b80eacf8edfcd1",
+        name = "vendor_ts__rustc-stable-hash-0.1.2",
+        sha256 = "781442f29170c5c93b7185ad559492601acdc71d5bb0706f5868094f45cfcd08",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/rustc-stable-hash/0.1.2/download"],
+        strip_prefix = "rustc-stable-hash-0.1.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustc-stable-hash-0.1.2.bazel"),
     )
 
     maybe(
@@ -2801,42 +2851,52 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__ryu-1.0.19",
-        sha256 = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd",
+        name = "vendor_ts__rustversion-1.0.21",
+        sha256 = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/rustversion/1.0.21/download"],
+        strip_prefix = "rustversion-1.0.21",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.rustversion-1.0.21.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__ryu-1.0.20",
+        sha256 = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f",
         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"),
+        urls = ["https://static.crates.io/crates/ryu/1.0.20/download"],
+        strip_prefix = "ryu-1.0.20",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.ryu-1.0.20.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-0.22.0",
-        sha256 = "c8fff508e3d6ef42a32607f7538e17171a877a12015e32036f46e99d00c95781",
+        name = "vendor_ts__salsa-0.23.0",
+        sha256 = "2e235afdb8e510f38a07138fbe5a0b64691894358a9c0cbd813b1aade110efc9",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa/0.22.0/download"],
-        strip_prefix = "salsa-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/salsa/0.23.0/download"],
+        strip_prefix = "salsa-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-0.23.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-macro-rules-0.22.0",
-        sha256 = "8ea72b3c06f2ce6350fe3a0eeb7aaaf842d1d8352b706973c19c4f02e298a87c",
+        name = "vendor_ts__salsa-macro-rules-0.23.0",
+        sha256 = "2edb86a7e9c91f6d30c9ce054312721dbe773a162db27bbfae834d16177b30ce",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.22.0/download"],
-        strip_prefix = "salsa-macro-rules-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/salsa-macro-rules/0.23.0/download"],
+        strip_prefix = "salsa-macro-rules-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macro-rules-0.23.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__salsa-macros-0.22.0",
-        sha256 = "0ce92025bc160b27814a207cb78d680973af17f863c7f4fc56cf3a535e22f378",
+        name = "vendor_ts__salsa-macros-0.23.0",
+        sha256 = "d0778d6e209051bc4e75acfe83bcd7848601ec3dbe9c3dbb982829020e9128af",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/salsa-macros/0.22.0/download"],
-        strip_prefix = "salsa-macros-0.22.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.22.0.bazel"),
+        urls = ["https://static.crates.io/crates/salsa-macros/0.23.0/download"],
+        strip_prefix = "salsa-macros-0.23.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.salsa-macros-0.23.0.bazel"),
     )
 
     maybe(
@@ -2859,6 +2919,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-0.9.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__schemars-1.0.4",
+        sha256 = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/schemars/1.0.4/download"],
+        strip_prefix = "schemars-1.0.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.schemars-1.0.4.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__scoped-tls-1.0.1",
@@ -2879,6 +2949,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.scopeguard-1.2.0.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__seize-0.5.0",
+        sha256 = "e4b8d813387d566f627f3ea1b914c068aac94c40ae27ec43f5f33bde65abefe7",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/seize/0.5.0/download"],
+        strip_prefix = "seize-0.5.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.seize-0.5.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__semver-1.0.26",
@@ -2931,12 +3011,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_json-1.0.140",
-        sha256 = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373",
+        name = "vendor_ts__serde_json-1.0.142",
+        sha256 = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/serde_json/1.0.142/download"],
+        strip_prefix = "serde_json-1.0.142",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_json-1.0.142.bazel"),
     )
 
     maybe(
@@ -2951,22 +3031,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_with-3.13.0",
-        sha256 = "bf65a400f8f66fb7b0552869ad70157166676db75ed8181f8104ea91cf9d0b42",
+        name = "vendor_ts__serde_spanned-1.0.0",
+        sha256 = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/serde_spanned/1.0.0/download"],
+        strip_prefix = "serde_spanned-1.0.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_spanned-1.0.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__serde_with-3.14.0",
+        sha256 = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with/3.13.0/download"],
-        strip_prefix = "serde_with-3.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.13.0.bazel"),
+        urls = ["https://static.crates.io/crates/serde_with/3.14.0/download"],
+        strip_prefix = "serde_with-3.14.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with-3.14.0.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__serde_with_macros-3.13.0",
-        sha256 = "81679d9ed988d5e9a5e6531dc3f2c28efbd639cbd1dfb628df08edea6004da77",
+        name = "vendor_ts__serde_with_macros-3.14.0",
+        sha256 = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/serde_with_macros/3.13.0/download"],
-        strip_prefix = "serde_with_macros-3.13.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.13.0.bazel"),
+        urls = ["https://static.crates.io/crates/serde_with_macros/3.14.0/download"],
+        strip_prefix = "serde_with_macros-3.14.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.serde_with_macros-3.14.0.bazel"),
     )
 
     maybe(
@@ -3051,22 +3141,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__syn-2.0.103",
-        sha256 = "e4307e30089d6fd6aff212f2da3a1f9e32f3223b1f010fb09b7c95f90f3ca1e8",
+        name = "vendor_ts__syn-2.0.104",
+        sha256 = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/syn/2.0.103/download"],
-        strip_prefix = "syn-2.0.103",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.103.bazel"),
+        urls = ["https://static.crates.io/crates/syn/2.0.104/download"],
+        strip_prefix = "syn-2.0.104",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.syn-2.0.104.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__synstructure-0.13.1",
-        sha256 = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971",
+        name = "vendor_ts__synstructure-0.13.2",
+        sha256 = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/synstructure/0.13.1/download"],
-        strip_prefix = "synstructure-0.13.1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.1.bazel"),
+        urls = ["https://static.crates.io/crates/synstructure/0.13.2/download"],
+        strip_prefix = "synstructure-0.13.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.synstructure-0.13.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__temp-dir-0.1.16",
+        sha256 = "83176759e9416cf81ee66cb6508dbfe9c96f20b8b56265a39917551c23c70964",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/temp-dir/0.1.16/download"],
+        strip_prefix = "temp-dir-0.1.16",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.temp-dir-0.1.16.bazel"),
     )
 
     maybe(
@@ -3089,16 +3189,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thin-vec-0.2.14.bazel"),
     )
 
-    maybe(
-        http_archive,
-        name = "vendor_ts__thiserror-1.0.69",
-        sha256 = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/thiserror/1.0.69/download"],
-        strip_prefix = "thiserror-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-1.0.69.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__thiserror-2.0.12",
@@ -3109,16 +3199,6 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-2.0.12.bazel"),
     )
 
-    maybe(
-        http_archive,
-        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"],
-        strip_prefix = "thiserror-impl-1.0.69",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.thiserror-impl-1.0.69.bazel"),
-    )
-
     maybe(
         http_archive,
         name = "vendor_ts__thiserror-impl-2.0.12",
@@ -3141,32 +3221,32 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__time-0.3.37",
-        sha256 = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21",
+        name = "vendor_ts__time-0.3.41",
+        sha256 = "8a7619e19bc266e0f9c5e6686659d394bc57973859340060a69221e57dbc0c40",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time/0.3.37/download"],
-        strip_prefix = "time-0.3.37",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.37.bazel"),
+        urls = ["https://static.crates.io/crates/time/0.3.41/download"],
+        strip_prefix = "time-0.3.41",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-0.3.41.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__time-core-0.1.2",
-        sha256 = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3",
+        name = "vendor_ts__time-core-0.1.4",
+        sha256 = "c9e9a38711f559d9e3ce1cdb06dd7c5b8ea546bc90052da6d06bb76da74bb07c",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-core/0.1.2/download"],
-        strip_prefix = "time-core-0.1.2",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.2.bazel"),
+        urls = ["https://static.crates.io/crates/time-core/0.1.4/download"],
+        strip_prefix = "time-core-0.1.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-core-0.1.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__time-macros-0.2.19",
-        sha256 = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de",
+        name = "vendor_ts__time-macros-0.2.22",
+        sha256 = "3526739392ec93fd8b359c8e98514cb3e8e021beb4e5f597b00a0221f8ed8a49",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/time-macros/0.2.19/download"],
-        strip_prefix = "time-macros-0.2.19",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.19.bazel"),
+        urls = ["https://static.crates.io/crates/time-macros/0.2.22/download"],
+        strip_prefix = "time-macros-0.2.22",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.time-macros-0.2.22.bazel"),
     )
 
     maybe(
@@ -3189,6 +3269,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.8.23.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml-0.9.5",
+        sha256 = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml/0.9.5/download"],
+        strip_prefix = "toml-0.9.5",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml-0.9.5.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_datetime-0.6.11",
@@ -3199,6 +3289,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.6.11.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_datetime-0.7.0",
+        sha256 = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_datetime/0.7.0/download"],
+        strip_prefix = "toml_datetime-0.7.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_datetime-0.7.0.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_edit-0.22.27",
@@ -3209,6 +3309,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_edit-0.22.27.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_parser-1.0.2",
+        sha256 = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_parser/1.0.2/download"],
+        strip_prefix = "toml_parser-1.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_parser-1.0.2.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__toml_write-0.1.2",
@@ -3219,6 +3329,16 @@ def crate_repositories():
         build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_write-0.1.2.bazel"),
     )
 
+    maybe(
+        http_archive,
+        name = "vendor_ts__toml_writer-1.0.2",
+        sha256 = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/toml_writer/1.0.2/download"],
+        strip_prefix = "toml_writer-1.0.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.toml_writer-1.0.2.bazel"),
+    )
+
     maybe(
         http_archive,
         name = "vendor_ts__tracing-0.1.41",
@@ -3231,22 +3351,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__tracing-attributes-0.1.28",
-        sha256 = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d",
+        name = "vendor_ts__tracing-attributes-0.1.30",
+        sha256 = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.28/download"],
-        strip_prefix = "tracing-attributes-0.1.28",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.28.bazel"),
+        urls = ["https://static.crates.io/crates/tracing-attributes/0.1.30/download"],
+        strip_prefix = "tracing-attributes-0.1.30",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-attributes-0.1.30.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__tracing-core-0.1.33",
-        sha256 = "e672c95779cf947c5311f83787af4fa8fffd12fb27e4993211a84bdfd9610f9c",
+        name = "vendor_ts__tracing-core-0.1.34",
+        sha256 = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/tracing-core/0.1.33/download"],
-        strip_prefix = "tracing-core-0.1.33",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.33.bazel"),
+        urls = ["https://static.crates.io/crates/tracing-core/0.1.34/download"],
+        strip_prefix = "tracing-core-0.1.34",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.tracing-core-0.1.34.bazel"),
     )
 
     maybe(
@@ -3391,12 +3511,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__unicode-ident-1.0.17",
-        sha256 = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe",
+        name = "vendor_ts__unicode-ident-1.0.18",
+        sha256 = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/unicode-ident/1.0.17/download"],
-        strip_prefix = "unicode-ident-1.0.17",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.17.bazel"),
+        urls = ["https://static.crates.io/crates/unicode-ident/1.0.18/download"],
+        strip_prefix = "unicode-ident-1.0.18",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.unicode-ident-1.0.18.bazel"),
     )
 
     maybe(
@@ -3461,12 +3581,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__valuable-0.1.0",
-        sha256 = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d",
+        name = "vendor_ts__valuable-0.1.1",
+        sha256 = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/valuable/0.1.0/download"],
-        strip_prefix = "valuable-0.1.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.0.bazel"),
+        urls = ["https://static.crates.io/crates/valuable/0.1.1/download"],
+        strip_prefix = "valuable-0.1.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.valuable-0.1.1.bazel"),
     )
 
     maybe(
@@ -3491,72 +3611,72 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasi-0.11.0-wasi-snapshot-preview1",
-        sha256 = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423",
+        name = "vendor_ts__wasi-0.11.1-wasi-snapshot-preview1",
+        sha256 = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasi/0.11.0+wasi-snapshot-preview1/download"],
-        strip_prefix = "wasi-0.11.0+wasi-snapshot-preview1",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.0+wasi-snapshot-preview1.bazel"),
+        urls = ["https://static.crates.io/crates/wasi/0.11.1+wasi-snapshot-preview1/download"],
+        strip_prefix = "wasi-0.11.1+wasi-snapshot-preview1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.11.1+wasi-snapshot-preview1.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasi-0.13.3-wasi-0.2.2",
-        sha256 = "26816d2e1a4a36a2940b96c5296ce403917633dff8f3440e9b236ed6f6bacad2",
+        name = "vendor_ts__wasi-0.14.2-wasi-0.2.4",
+        sha256 = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3",
         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"),
+        urls = ["https://static.crates.io/crates/wasi/0.14.2+wasi-0.2.4/download"],
+        strip_prefix = "wasi-0.14.2+wasi-0.2.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasi-0.14.2+wasi-0.2.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-0.2.99",
-        sha256 = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396",
+        name = "vendor_ts__wasm-bindgen-0.2.100",
+        sha256 = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen/0.2.100/download"],
+        strip_prefix = "wasm-bindgen-0.2.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-0.2.100.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-backend-0.2.99",
-        sha256 = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79",
+        name = "vendor_ts__wasm-bindgen-backend-0.2.100",
+        sha256 = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-backend-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-backend/0.2.100/download"],
+        strip_prefix = "wasm-bindgen-backend-0.2.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-backend-0.2.100.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-0.2.99",
-        sha256 = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe",
+        name = "vendor_ts__wasm-bindgen-macro-0.2.100",
+        sha256 = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-macro-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro/0.2.100/download"],
+        strip_prefix = "wasm-bindgen-macro-0.2.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-0.2.100.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-macro-support-0.2.99",
-        sha256 = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2",
+        name = "vendor_ts__wasm-bindgen-macro-support-0.2.100",
+        sha256 = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-macro-support-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-macro-support/0.2.100/download"],
+        strip_prefix = "wasm-bindgen-macro-support-0.2.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-macro-support-0.2.100.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__wasm-bindgen-shared-0.2.99",
-        sha256 = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6",
+        name = "vendor_ts__wasm-bindgen-shared-0.2.100",
+        sha256 = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.99/download"],
-        strip_prefix = "wasm-bindgen-shared-0.2.99",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.99.bazel"),
+        urls = ["https://static.crates.io/crates/wasm-bindgen-shared/0.2.100/download"],
+        strip_prefix = "wasm-bindgen-shared-0.2.100",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wasm-bindgen-shared-0.2.100.bazel"),
     )
 
     maybe(
@@ -3601,22 +3721,62 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-core-0.52.0",
-        sha256 = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9",
+        name = "vendor_ts__windows-core-0.61.2",
+        sha256 = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-core/0.61.2/download"],
+        strip_prefix = "windows-core-0.61.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.61.2.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-implement-0.60.0",
+        sha256 = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-implement/0.60.0/download"],
+        strip_prefix = "windows-implement-0.60.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-implement-0.60.0.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-interface-0.59.1",
+        sha256 = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-interface/0.59.1/download"],
+        strip_prefix = "windows-interface-0.59.1",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-interface-0.59.1.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-link-0.1.3",
+        sha256 = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a",
+        type = "tar.gz",
+        urls = ["https://static.crates.io/crates/windows-link/0.1.3/download"],
+        strip_prefix = "windows-link-0.1.3",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-link-0.1.3.bazel"),
+    )
+
+    maybe(
+        http_archive,
+        name = "vendor_ts__windows-result-0.3.4",
+        sha256 = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/windows-core/0.52.0/download"],
-        strip_prefix = "windows-core-0.52.0",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-core-0.52.0.bazel"),
+        urls = ["https://static.crates.io/crates/windows-result/0.3.4/download"],
+        strip_prefix = "windows-result-0.3.4",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-result-0.3.4.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__windows-link-0.1.1",
-        sha256 = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38",
+        name = "vendor_ts__windows-strings-0.4.2",
+        sha256 = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57",
         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"),
+        urls = ["https://static.crates.io/crates/windows-strings/0.4.2/download"],
+        strip_prefix = "windows-strings-0.4.2",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.windows-strings-0.4.2.bazel"),
     )
 
     maybe(
@@ -3931,12 +4091,12 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__wit-bindgen-rt-0.33.0",
-        sha256 = "3268f3d866458b787f390cf61f4bbb563b922d091359f9608842999eaee3943c",
+        name = "vendor_ts__wit-bindgen-rt-0.39.0",
+        sha256 = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1",
         type = "tar.gz",
-        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"),
+        urls = ["https://static.crates.io/crates/wit-bindgen-rt/0.39.0/download"],
+        strip_prefix = "wit-bindgen-rt-0.39.0",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.wit-bindgen-rt-0.39.0.bazel"),
     )
 
     maybe(
@@ -3981,42 +4141,22 @@ def crate_repositories():
 
     maybe(
         http_archive,
-        name = "vendor_ts__zerocopy-0.7.35",
-        sha256 = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0",
-        type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy/0.7.35/download"],
-        strip_prefix = "zerocopy-0.7.35",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.7.35.bazel"),
-    )
-
-    maybe(
-        http_archive,
-        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",
+        name = "vendor_ts__zerocopy-0.8.26",
+        sha256 = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f",
         type = "tar.gz",
-        urls = ["https://static.crates.io/crates/zerocopy-derive/0.7.35/download"],
-        strip_prefix = "zerocopy-derive-0.7.35",
-        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.7.35.bazel"),
+        urls = ["https://static.crates.io/crates/zerocopy/0.8.26/download"],
+        strip_prefix = "zerocopy-0.8.26",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-0.8.26.bazel"),
     )
 
     maybe(
         http_archive,
-        name = "vendor_ts__zerocopy-derive-0.8.20",
-        sha256 = "eea57037071898bf96a6da35fd626f4f27e9cee3ead2a6c703cf09d472b2e700",
+        name = "vendor_ts__zerocopy-derive-0.8.26",
+        sha256 = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181",
         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"),
+        urls = ["https://static.crates.io/crates/zerocopy-derive/0.8.26/download"],
+        strip_prefix = "zerocopy-derive-0.8.26",
+        build_file = Label("//misc/bazel/3rdparty/tree_sitter_extractors_deps:BUILD.zerocopy-derive-0.8.26.bazel"),
     )
 
     maybe(
@@ -4100,48 +4240,48 @@ def crate_repositories():
     )
 
     return [
-        struct(repo = "vendor_ts__anyhow-1.0.98", is_dev_dep = False),
+        struct(repo = "vendor_ts__anyhow-1.0.99", is_dev_dep = False),
         struct(repo = "vendor_ts__argfile-0.2.1", is_dev_dep = False),
-        struct(repo = "vendor_ts__chalk-ir-0.103.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__chalk-ir-0.104.0", is_dev_dep = False),
         struct(repo = "vendor_ts__chrono-0.4.41", is_dev_dep = False),
-        struct(repo = "vendor_ts__clap-4.5.40", is_dev_dep = False),
+        struct(repo = "vendor_ts__clap-4.5.44", 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__glob-0.3.3", 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.17.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__proc-macro2-1.0.95", is_dev_dep = False),
+        struct(repo = "vendor_ts__proc-macro2-1.0.97", 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.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_cfg-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_intern-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_parser-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_paths-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_project_model-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_span-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_stdx-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_syntax-0.0.288", is_dev_dep = False),
-        struct(repo = "vendor_ts__ra_ap_vfs-0.0.288", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_base_db-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_cfg-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_def-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_expand-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_hir_ty-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_ide_db-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_intern-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_load-cargo-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_parser-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_paths-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_project_model-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_span-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_stdx-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_syntax-0.0.300", is_dev_dep = False),
+        struct(repo = "vendor_ts__ra_ap_vfs-0.0.300", 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.13.0", is_dev_dep = False),
-        struct(repo = "vendor_ts__syn-2.0.103", is_dev_dep = False),
-        struct(repo = "vendor_ts__toml-0.8.23", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_json-1.0.142", is_dev_dep = False),
+        struct(repo = "vendor_ts__serde_with-3.14.0", is_dev_dep = False),
+        struct(repo = "vendor_ts__syn-2.0.104", is_dev_dep = False),
+        struct(repo = "vendor_ts__toml-0.9.5", 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),
@@ -4151,7 +4291,7 @@ def crate_repositories():
         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__zstd-0.13.3", is_dev_dep = False),
-        struct(repo = "vendor_ts__rand-0.9.1", is_dev_dep = True),
+        struct(repo = "vendor_ts__rand-0.9.2", 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/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index 541e9e2a945b..4a5e75cac92a 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.30.md b/misc/suite-helpers/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 0a4fd9b08e5f..78bba0ca5881 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.29
+version: 1.0.30
 groups: shared
 warnOnImplicitThis: true
diff --git a/powershell/ql/lib/semmle/code/powershell/controlflow/BasicBlocks.qll b/powershell/ql/lib/semmle/code/powershell/controlflow/BasicBlocks.qll
index ed24f23309c0..028cecccd475 100644
--- a/powershell/ql/lib/semmle/code/powershell/controlflow/BasicBlocks.qll
+++ b/powershell/ql/lib/semmle/code/powershell/controlflow/BasicBlocks.qll
@@ -6,6 +6,7 @@ private import CfgNodes
 private import SuccessorTypes
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -157,3 +158,23 @@ final class JoinBlockPredecessor extends BasicBlock, BasicBlocksImpl::JoinPredec
  * control flow.
  */
 final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBlock { }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+private class SuccessorTypeAlias = SuccessorType;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = CfgNode;
+
+  class SuccessorType = SuccessorTypeAlias;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
index 89c57e478426..6f10c710fce6 100644
--- a/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
+++ b/powershell/ql/lib/semmle/code/powershell/dataflow/internal/SsaImpl.qll
@@ -1,23 +1,17 @@
 private import codeql.ssa.Ssa as SsaImplCommon
 private import powershell
 private import semmle.code.powershell.Cfg as Cfg
+private import semmle.code.powershell.controlflow.BasicBlocks as BasicBlocks
 private import semmle.code.powershell.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 private import semmle.code.powershell.dataflow.Ssa
 import Cfg::CfgNodes
 private import ExprNodes
 private import StmtNodes
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
-  private import semmle.code.powershell.controlflow.BasicBlocks as BasicBlocks
-
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = Cfg::CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+private class BasicBlock = BasicBlocks::Cfg::BasicBlock;
 
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
+  private import semmle.code.powershell.controlflow.ControlFlowGraph as Cfg
 
   class SourceVariable = Variable;
 
@@ -54,7 +48,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -300,7 +294,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
 
     predicate isFinalEnvVarRead(Scope scope, EnvVariable v) { this = TFinalEnvVarRead(scope, v) }
 
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) {
+    predicate hasCfgNode(BasicBlock bb, int i) {
       this.asExprCfgNode() = bb.getNode(i)
       or
       exists(EnvVariable v |
@@ -341,9 +335,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * and that the edge from `bb1` to `bb2` corresponds to the evaluation of this
      * guard to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
 
@@ -351,9 +343,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
         this.getBasicBlock() = bb1 and
         bb2 = bb1.getASuccessor(s) and
@@ -363,9 +353,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
-    none()
-  }
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) { none() }
 }
 
 private module DataFlowIntegrationImpl = Impl::DataFlowIntegration<DataFlowIntegrationInput>;
diff --git a/python/codeql-extractor.yml b/python/codeql-extractor.yml
index 97a9e1f2cf2f..c8b51db42e6a 100644
--- a/python/codeql-extractor.yml
+++ b/python/codeql-extractor.yml
@@ -4,6 +4,8 @@ version: 1.22.1
 column_kind: utf32
 build_modes:
   - none
+default_queries:
+  - codeql/python-queries
 github_api_languages:
   - Python
 scc_languages:
diff --git a/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected b/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
index 960972c508c8..25790385f576 100644
--- a/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-code-quality-extended.qls.expected
@@ -1,12 +1,14 @@
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
 ql/python/ql/src/Classes/MissingCallToDel.ql
 ql/python/ql/src/Classes/MissingCallToInit.ql
 ql/python/ql/src/Classes/MutatingDescriptor.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
 ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
 ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
 ql/python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql
diff --git a/python/ql/integration-tests/query-suite/python-code-quality.qls.expected b/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
index 960972c508c8..25790385f576 100644
--- a/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-code-quality.qls.expected
@@ -1,12 +1,14 @@
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
 ql/python/ql/src/Classes/MissingCallToDel.ql
 ql/python/ql/src/Classes/MissingCallToInit.ql
 ql/python/ql/src/Classes/MutatingDescriptor.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
 ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
 ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
 ql/python/ql/src/Classes/WrongNameForArgumentInClassInstantiation.ql
diff --git a/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected b/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
index 170d9f442f92..8f581e166c38 100644
--- a/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
+++ b/python/ql/integration-tests/query-suite/python-security-and-quality.qls.expected
@@ -1,8 +1,8 @@
+ql/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
+ql/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
+ql/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
 ql/python/ql/src/Classes/ConflictingAttributesInBaseClasses.ql
 ql/python/ql/src/Classes/DefineEqualsWhenAddingAttributes.ql
-ql/python/ql/src/Classes/EqualsOrHash.ql
-ql/python/ql/src/Classes/EqualsOrNotEquals.ql
-ql/python/ql/src/Classes/IncompleteOrdering.ql
 ql/python/ql/src/Classes/InconsistentMRO.ql
 ql/python/ql/src/Classes/InitCallsSubclass/InitCallsSubclassMethod.ql
 ql/python/ql/src/Classes/MissingCallToDel.ql
@@ -11,7 +11,7 @@ ql/python/ql/src/Classes/MutatingDescriptor.ql
 ql/python/ql/src/Classes/OverwritingAttributeInSuperClass.ql
 ql/python/ql/src/Classes/PropertyInOldStyleClass.ql
 ql/python/ql/src/Classes/SlotsInOldStyleClass.ql
-ql/python/ql/src/Classes/SubclassShadowing.ql
+ql/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
 ql/python/ql/src/Classes/SuperInOldStyleClass.ql
 ql/python/ql/src/Classes/SuperclassDelCalledMultipleTimes.ql
 ql/python/ql/src/Classes/SuperclassInitCalledMultipleTimes.ql
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index b71f642da270..eddd592be743 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,10 @@
+## 4.0.14
+
+### Minor Analysis Improvements
+
+- The modelling of Psycopg2 now supports the use of `psycopg2.pool` connection pools for handling database connections.
+* Removed `lxml` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/lxml/lxml/blob/f33ac2c2f5f9c4c4c1fc47f363be96db308f2fa6/doc/FAQ.txt#L1077) that prevents XML bomb attacks. 
+
 ## 4.0.13
 
 No user-facing changes.
diff --git a/python/ql/lib/change-notes/released/4.0.14.md b/python/ql/lib/change-notes/released/4.0.14.md
new file mode 100644
index 000000000000..41957d11048e
--- /dev/null
+++ b/python/ql/lib/change-notes/released/4.0.14.md
@@ -0,0 +1,6 @@
+## 4.0.14
+
+### Minor Analysis Improvements
+
+- The modelling of Psycopg2 now supports the use of `psycopg2.pool` connection pools for handling database connections.
+* Removed `lxml` as an XML bomb sink. The underlying libxml2 library now includes [entity reference loop detection](https://github.com/lxml/lxml/blob/f33ac2c2f5f9c4c4c1fc47f363be96db308f2fa6/doc/FAQ.txt#L1077) that prevents XML bomb attacks. 
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index a03f76ad5967..5e4c777a3399 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 4.0.13
+lastReleaseVersion: 4.0.14
diff --git a/python/ql/lib/printAst.ql b/python/ql/lib/printAst.ql
index e6af7e1eff1f..72fd89727c80 100644
--- a/python/ql/lib/printAst.ql
+++ b/python/ql/lib/printAst.ql
@@ -25,4 +25,9 @@ class PrintAstConfigurationOverride extends PrintAstConfiguration {
     super.shouldPrint(e, l) and
     l.getFile() = getFileBySourceArchiveName(selectedSourceFile())
   }
+
+  override predicate shouldPrintYaml(YamlNode y, Location l) {
+    super.shouldPrintYaml(y, l) and
+    l.getFile() = getFileBySourceArchiveName(selectedSourceFile())
+  }
 }
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 2b2e9428d874..e602a04603fb 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 4.0.13
+version: 4.0.14
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/lib/semmle/python/Class.qll b/python/ql/lib/semmle/python/Class.qll
index 52c6c5aa389b..58a6504b547c 100644
--- a/python/ql/lib/semmle/python/Class.qll
+++ b/python/ql/lib/semmle/python/Class.qll
@@ -91,6 +91,12 @@ class Class extends Class_, Scope, AstNode {
   /** Gets a method defined in this class */
   Function getAMethod() { result.getScope() = this }
 
+  /** Gets the method defined in this class with the specified name, if any. */
+  Function getMethod(string name) {
+    result = this.getAMethod() and
+    result.getName() = name
+  }
+
   override Location getLocation() { py_scope_location(result, this) }
 
   /** Gets the scope (module, class or function) in which this class is defined */
diff --git a/python/ql/lib/semmle/python/Flow.qll b/python/ql/lib/semmle/python/Flow.qll
index 90633651f110..c91a492e269e 100644
--- a/python/ql/lib/semmle/python/Flow.qll
+++ b/python/ql/lib/semmle/python/Flow.qll
@@ -1,6 +1,7 @@
 import python
 private import semmle.python.pointsto.PointsTo
 private import semmle.python.internal.CachedStages
+private import codeql.controlflow.BasicBlock as BB
 
 /*
  * Note about matching parent and child nodes and CFG splitting:
@@ -1082,9 +1083,15 @@ class BasicBlock extends @py_flow_node {
    * Dominance frontier of a node x is the set of all nodes `other` such that `this` dominates a predecessor
    * of `other` but does not strictly dominate `other`
    */
-  pragma[noinline]
-  predicate dominanceFrontier(BasicBlock other) {
-    this.dominates(other.getAPredecessor()) and not this.strictlyDominates(other)
+  predicate dominanceFrontier(BasicBlock other) { this.inDominanceFrontier(other) }
+
+  predicate inDominanceFrontier(BasicBlock df) {
+    this = df.getAPredecessor() and not this = df.getImmediateDominator()
+    or
+    exists(BasicBlock prev | prev.inDominanceFrontier(df) |
+      this = prev.getImmediateDominator() and
+      not this = df.getImmediateDominator()
+    )
   }
 
   private ControlFlowNode firstNode() { result = this }
@@ -1246,3 +1253,56 @@ private predicate end_bb_likely_reachable(BasicBlock b) {
     not p = b.getLastNode()
   )
 }
+
+private class ControlFlowNodeAlias = ControlFlowNode;
+
+final private class FinalBasicBlock = BasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowNodeAlias;
+
+  class SuccessorType = Unit;
+
+  class BasicBlock extends FinalBasicBlock {
+    // Note `PY:BasicBlock` does not have a `getLocation`.
+    // (Instead it has a complicated location info logic.)
+    // Using the location of the first node is simple
+    // and we just need a way to identify the basic block
+    // during debugging, so this will be serviceable.
+    Location getLocation() { result = super.getNode(0).getLocation() }
+
+    int length() { result = count(int i | exists(this.getNode(i))) }
+
+    BasicBlock getASuccessor() { result = super.getASuccessor() }
+
+    BasicBlock getASuccessor(SuccessorType t) { result = super.getASuccessor() and exists(t) }
+
+    predicate strictlyDominates(BasicBlock bb) { super.strictlyDominates(bb) }
+
+    predicate dominates(BasicBlock bb) { super.dominates(bb) }
+
+    predicate inDominanceFrontier(BasicBlock df) { super.inDominanceFrontier(df) }
+
+    BasicBlock getImmediateDominator() { result = super.getImmediateDominator() }
+
+    /** Unsupported. Do not use. */
+    predicate strictlyPostDominates(BasicBlock bb) { none() }
+
+    /** Unsupported. Do not use. */
+    predicate postDominates(BasicBlock bb) {
+      this.strictlyPostDominates(bb) or
+      this = bb
+    }
+  }
+
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { this.getNode(0).isEntryNode() }
+  }
+
+  pragma[nomagic]
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    bb1.getASuccessor() = bb2 and
+    bb1 = bb2.getImmediateDominator() and
+    forall(BasicBlock pred | pred = bb2.getAPredecessor() and pred != bb1 | bb2.dominates(pred))
+  }
+}
diff --git a/python/ql/lib/semmle/python/PrintAst.qll b/python/ql/lib/semmle/python/PrintAst.qll
index d2aec338a586..4fa75acd71e1 100644
--- a/python/ql/lib/semmle/python/PrintAst.qll
+++ b/python/ql/lib/semmle/python/PrintAst.qll
@@ -26,12 +26,22 @@ class PrintAstConfiguration extends TPrintAstConfiguration {
    * By default it checks whether the `AstNode` `e` belongs to `Location` `l`.
    */
   predicate shouldPrint(AstNode e, Location l) { l = e.getLocation() }
+
+  /**
+   * Controls whether the `YamlNode` should be considered for AST printing.
+   * By default it checks whether the `YamlNode` `y` belongs to `Location` `l`.
+   */
+  predicate shouldPrintYaml(YamlNode y, Location l) { l = y.getLocation() }
 }
 
 private predicate shouldPrint(AstNode e, Location l) {
   exists(PrintAstConfiguration config | config.shouldPrint(e, l))
 }
 
+private predicate shouldPrintYaml(YamlNode y, Location l) {
+  exists(PrintAstConfiguration config | config.shouldPrintYaml(y, l))
+}
+
 /** Holds if the given element does not need to be rendered in the AST. */
 private predicate isNotNeeded(AstNode el) {
   el.isArtificial()
@@ -55,8 +65,11 @@ private newtype TPrintAstNode =
     not list = any(Module mod).getBody() and
     not forall(AstNode child | child = list.getAnItem() | isNotNeeded(child))
   } or
-  TYamlNode(YamlNode node) or
-  TYamlMappingNode(YamlMapping mapping, int i) { exists(mapping.getKeyNode(i)) }
+  TYamlNode(YamlNode node) { shouldPrintYaml(node, _) } or
+  TYamlMappingNode(YamlMapping mapping, int i) {
+    shouldPrintYaml(mapping, _) and
+    exists(mapping.getKeyNode(i))
+  }
 
 /**
  * A node in the output tree.
diff --git a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
index 6cb80881e2a8..a7b3b9ceaebf 100644
--- a/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
+++ b/python/ql/lib/semmle/python/dataflow/new/internal/VariableCapture.qll
@@ -12,7 +12,7 @@ private import codeql.dataflow.VariableCapture as Shared
 // The first is the main implementation, the second is a performance motivated restriction.
 // The restriction is to clear any `CapturedVariableContent` before writing a new one
 // to avoid long access paths (see the link for a nice explanation).
-private module CaptureInput implements Shared::InputSig<Location> {
+private module CaptureInput implements Shared::InputSig<Location, Cfg::BasicBlock> {
   private import python as PY
 
   additional class ExprCfgNode extends ControlFlowNode {
@@ -23,24 +23,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
     predicate isConstructor() { none() }
   }
 
-  class BasicBlock extends PY::BasicBlock {
-    int length() { result = count(int i | exists(this.getNode(i))) }
-
-    Callable getEnclosingCallable() { result = this.getScope() }
-
-    // Note `PY:BasicBlock` does not have a `getLocation`.
-    // (Instead it has a complicated location info logic.)
-    // Using the location of the first node is simple
-    // and we just need a way to identify the basic block
-    // during debugging, so this will be serviceable.
-    Location getLocation() { result = super.getNode(0).getLocation() }
-  }
-
-  class ControlFlowNode = PY::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(Cfg::BasicBlock bb) { result = bb.getScope() }
 
   class CapturedVariable extends LocalVariable {
     Function f;
@@ -70,7 +53,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
   }
 
   class Expr extends ExprCfgNode {
-    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   class VariableWrite extends ControlFlowNode {
@@ -80,7 +63,7 @@ private module CaptureInput implements Shared::InputSig<Location> {
 
     CapturedVariable getVariable() { result = v }
 
-    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(Cfg::BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   class VariableRead extends Expr {
@@ -122,7 +105,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class ClosureExpr = CaptureInput::ClosureExpr;
 
-module Flow = Shared::Flow<Location, CaptureInput>;
+module Flow = Shared::Flow<Location, Cfg, CaptureInput>;
 
 private Flow::ClosureNode asClosureNode(Node n) {
   result = n.(SynthCaptureNode).getSynthesizedCaptureNode()
diff --git a/python/ql/lib/semmle/python/frameworks/Lxml.qll b/python/ql/lib/semmle/python/frameworks/Lxml.qll
index c503d7d5cfbc..e043093ed49e 100644
--- a/python/ql/lib/semmle/python/frameworks/Lxml.qll
+++ b/python/ql/lib/semmle/python/frameworks/Lxml.qll
@@ -129,11 +129,6 @@ module Lxml {
             any(True t)
         )
         or
-        kind.isXmlBomb() and
-        this.getKeywordParameter("huge_tree").getAValueReachingSink().asExpr() = any(True t) and
-        not this.getKeywordParameter("resolve_entities").getAValueReachingSink().asExpr() =
-          any(False t)
-        or
         kind.isDtdRetrieval() and
         this.getKeywordParameter("load_dtd").getAValueReachingSink().asExpr() = any(True t) and
         this.getKeywordParameter("no_network").getAValueReachingSink().asExpr() = any(False t)
@@ -305,9 +300,8 @@ module Lxml {
       // note that there is no `resolve_entities` argument, so it's not possible to turn off XXE :O
       kind.isXxe()
       or
-      kind.isXmlBomb() and
-      this.getKeywordParameter("huge_tree").getAValueReachingSink().asExpr() = any(True t)
-      or
+      // libxml2 has built-in protection against XML bombs via entity reference loop detection,
+      // so lxml is not vulnerable to XML bomb attacks.
       kind.isDtdRetrieval() and
       this.getKeywordParameter("load_dtd").getAValueReachingSink().asExpr() = any(True t) and
       this.getKeywordParameter("no_network").getAValueReachingSink().asExpr() = any(False t)
diff --git a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
index 74016ebd639d..93011f222775 100644
--- a/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
+++ b/python/ql/lib/semmle/python/frameworks/Psycopg2.qll
@@ -29,4 +29,17 @@ private module Psycopg2 {
   class Psycopg2 extends PEP249::PEP249ModuleApiNode {
     Psycopg2() { this = API::moduleImport("psycopg2") }
   }
+
+  /** A database connection obtained from a psycopg2 connection pool. */
+  class Psycopg2ConnectionPoolMember extends PEP249::DatabaseConnection {
+    Psycopg2ConnectionPoolMember() {
+      this =
+        any(Psycopg2 p)
+            .getMember("pool")
+            .getMember(["SimpleConnectionPool", "ThreadedConnectionPool", "AbstractConnectionPool"])
+            .getAnInstance()
+            .getMember("getconn")
+            .getReturn()
+    }
+  }
 }
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 42d3b42a5e81..0c22d526f395 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.6.4
+
+### Minor Analysis Improvements
+
+* The `py/unexpected-raise-in-special-method` query has been modernized. It produces additional results in cases where the exception is 
+only raised conditionally. Its precision has been changed from `very-high` to `high`.
+* The queries `py/incomplete-ordering`, `py/inconsistent-equality`, and `py/equals-hash-mismatch` have been modernized; no longer relying on outdated libraries, improved documentation, and no longer producing alerts for problems specific to Python 2.
+
 ## 1.6.3
 
 No user-facing changes.
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp b/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp
new file mode 100644
index 000000000000..562ad7be1bd6
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrHash.qhelp
@@ -0,0 +1,44 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>A hashable class has an <code>__eq__</code> method, and a <code>__hash__</code> method that agrees with equality. 
+When a hash method is defined, an equality method should also be defined; otherwise object identity is used for equality comparisons 
+which may not be intended.
+ </p>
+
+<p>Note that defining an <code>__eq__</code> method without defining a <code>__hash__</code> method automatically makes the class unhashable in Python 3.
+(even if a superclass defines a hash method).</p>
+
+</overview>
+<recommendation>
+
+<p>
+If a <code>__hash__</code> method is defined, ensure a compatible <code>__eq__</code> method is also defined.
+</p>
+
+<p>
+To explicitly declare a class as unhashable, set <code>__hash__ = None</code>, rather than defining a <code>__hash__</code> method that always
+raises an exception. Otherwise, the class would be incorrectly identified as hashable by an <code>isinstance(obj, collections.abc.Hashable)</code> call.
+</p>
+
+</recommendation>
+<example>
+<p>In the following example, the <code>A</code> class defines an hash method but 
+no equality method. Equality will be determined by object identity, which may not be the expected behaviour.
+</p>
+
+<sample src="examples/EqualsOrHash.py" />
+
+</example>
+<references>
+
+
+<li>Python Language Reference: <a href="http://docs.python.org/reference/datamodel.html#object.__hash__">object.__hash__</a>.</li>
+<li>Python Glossary: <a href="http://docs.python.org/3/glossary.html#term-hashable">hashable</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrHash.ql b/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
new file mode 100644
index 000000000000..54393cf1573f
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrHash.ql
@@ -0,0 +1,26 @@
+/**
+ * @name Inconsistent equality and hashing
+ * @description Defining a hash operation without defining equality may be a mistake.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ *       external/cwe/cwe-581
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/equals-hash-mismatch
+ */
+
+import python
+
+predicate missingEquality(Class cls, Function defined) {
+  defined = cls.getMethod("__hash__") and
+  not exists(cls.getMethod("__eq__"))
+  // In python 3, the case of defined eq without hash automatically makes the class unhashable (even if a superclass defined hash)
+  // So this is not an issue.
+}
+
+from Class cls, Function defined
+where missingEquality(cls, defined)
+select cls, "This class implements $@, but does not implement __eq__.", defined, defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp
new file mode 100644
index 000000000000..74f20d9f0c51
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.qhelp
@@ -0,0 +1,53 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+<p>In order to ensure the <code>==</code> and <code>!=</code> operators behave consistently as expected (i.e. they should be negations of each other), care should be taken when implementing the 
+<code>__eq__</code> and <code>__ne__</code> special methods.</p>
+
+<p>In Python 3, if the <code>__eq__</code> method is defined in a class while the <code>__ne__</code> is not, 
+then the <code>!=</code> operator will automatically delegate to the <code>__eq__</code> method in the expected way. 
+ </p>
+
+ <p>However, if the <code>__ne__</code> method is defined without a corresponding <code>__eq__</code> method, 
+ the <code>==</code> operator will still default to object identity (equivalent to the <code>is</code> operator), while the <code>!=</code>
+ operator will use the <code>__ne__</code> method, which may be inconsistent.
+ </p>
+
+<p>Additionally, if the <code>__ne__</code> method is defined on a superclass, and the subclass defines its own <code>__eq__</code> method without overriding
+the superclass <code>__ne__</code> method, the <code>!=</code> operator will use this superclass <code>__ne__</code> method, rather than automatically delegating
+to <code>__eq__</code>, which may be incorrect.
+</p>
+
+</overview>
+<recommendation>
+
+<p>Ensure that when an <code>__ne__</code> method is defined, the <code>__eq__</code> method is also defined, and their results are consistent.
+In most cases, the <code>__ne__</code> method does not need to be defined at all, as the default behavior is to delegate to <code>__eq__</code> and negate the result. </p>
+
+</recommendation>
+<example>
+<p>In the following example, <code>A</code> defines a <code>__ne__</code> method, but not an <code>__eq__</code> method.
+This leads to inconsistent results between equality and inequality operators. 
+</p>
+
+<sample src="examples/EqualsOrNotEquals1.py" />
+
+<p>In the following example, <code>C</code> defines an <code>__eq__</code> method, but its <code>__ne__</code> implementation is inherited from <code>B</code>, 
+which is not consistent with the equality operation.
+</p>
+
+<sample src="examples/EqualsOrNotEquals2.py" />
+
+</example>
+<references>
+
+
+<li>Python Language Reference: <a href="http://docs.python.org/3/reference/datamodel.html#object.__ne__">object.__ne__</a>, 
+<a href="http://docs.python.org/3/reference/expressions.html#comparisons">Comparisons</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
new file mode 100644
index 000000000000..ea025f39c2fc
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/EqualsOrNotEquals.ql
@@ -0,0 +1,37 @@
+/**
+ * @name Inconsistent equality and inequality
+ * @description Class definitions of equality and inequality operators may be inconsistent.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity high
+ * @precision very-high
+ * @id py/inconsistent-equality
+ */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import Classes.Equality
+
+predicate missingEquality(Class cls, Function defined, string missing) {
+  defined = cls.getMethod("__ne__") and
+  not exists(cls.getMethod("__eq__")) and
+  missing = "__eq__"
+  or
+  // In python 3, __ne__ automatically delegates to __eq__ if its not defined in the hierarchy
+  // However if it is defined in a superclass (and isn't a delegation method) then it will use the superclass method (which may be incorrect)
+  defined = cls.getMethod("__eq__") and
+  not exists(cls.getMethod("__ne__")) and
+  exists(Function neMeth |
+    neMeth = getADirectSuperclass+(cls).getMethod("__ne__") and
+    not neMeth instanceof DelegatingEqualityMethod
+  ) and
+  missing = "__ne__"
+}
+
+from Class cls, Function defined, string missing
+where missingEquality(cls, defined, missing)
+select cls, "This class implements $@, but does not implement " + missing + ".", defined,
+  defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp b/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp
new file mode 100644
index 000000000000..6bffaed7b87b
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/IncompleteOrdering.qhelp
@@ -0,0 +1,38 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p> A class that implements the rich comparison operators
+(<code>__lt__</code>, <code>__gt__</code>, <code>__le__</code>, or <code>__ge__</code>) should ensure that all four 
+comparison operations <code>&lt;</code>, <code>&lt;=</code>, <code>&gt;</code>, and <code>&gt;=</code> function as expected, consistent 
+with expected mathematical rules.   
+In Python 3, this is ensured by implementing one of <code>__lt__</code> or <code>__gt__</code>, and one of  <code>__le__</code> or <code>__ge__</code>.
+If the ordering is not consistent with default equality, then <code>__eq__</code> should also be implemented.
+</p>
+
+</overview>
+<recommendation>
+<p>Ensure that at least one of <code>__lt__</code> or <code>__gt__</code> and at least one of <code>__le__</code> or <code>__ge__</code> is defined. 
+  </p>
+
+<p>
+The <code>functools.total_ordering</code> class decorator can be used to automatically implement all four comparison methods from a 
+single one,
+which is typically the cleanest way to ensure all necessary comparison methods are implemented consistently.</p>
+
+</recommendation>
+<example>
+<p>In the following example, only the <code>__lt__</code> operator has been implemented, which would lead to unexpected
+errors if the <code>&lt;=</code> or <code>&gt;=</code> operators are used on <code>A</code> instances.
+The <code>__le__</code> method should also be defined, as well as <code>__eq__</code> in this case.</p>
+<sample src="examples/IncompleteOrdering.py" />
+
+</example>
+<references>
+
+  <li>Python Language Reference: <a href="http://docs.python.org/3/reference/datamodel.html#object.__lt__">Rich comparisons in Python</a>.</li>
+
+
+</references>
+</qhelp>
diff --git a/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql b/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
new file mode 100644
index 000000000000..e35f0c1a715f
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/IncompleteOrdering.ql
@@ -0,0 +1,55 @@
+/**
+ * @name Incomplete ordering
+ * @description Class defines ordering comparison methods, but does not define both strict and nonstrict ordering methods, to ensure all four comparison operators behave as expected.
+ * @kind problem
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @problem.severity warning
+ * @sub-severity low
+ * @precision very-high
+ * @id py/incomplete-ordering
+ */
+
+import python
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+import semmle.python.ApiGraphs
+
+/** Holds if `cls` has the `functools.total_ordering` decorator. */
+predicate totalOrdering(Class cls) {
+  API::moduleImport("functools")
+      .getMember("total_ordering")
+      .asSource()
+      .flowsTo(DataFlow::exprNode(cls.getADecorator()))
+}
+
+predicate definesStrictOrdering(Class cls, Function meth) {
+  meth = cls.getMethod("__lt__")
+  or
+  not exists(cls.getMethod("__lt__")) and
+  meth = cls.getMethod("__gt__")
+}
+
+predicate definesNonStrictOrdering(Class cls, Function meth) {
+  meth = cls.getMethod("__le__")
+  or
+  not exists(cls.getMethod("__le__")) and
+  meth = cls.getMethod("__ge__")
+}
+
+predicate missingComparison(Class cls, Function defined, string missing) {
+  definesStrictOrdering(cls, defined) and
+  not definesNonStrictOrdering(getADirectSuperclass*(cls), _) and
+  missing = "__le__ or __ge__"
+  or
+  definesNonStrictOrdering(cls, defined) and
+  not definesStrictOrdering(getADirectSuperclass*(cls), _) and
+  missing = "__lt__ or __gt__"
+}
+
+from Class cls, Function defined, string missing
+where
+  not totalOrdering(cls) and
+  missingComparison(cls, defined, missing)
+select cls, "This class implements $@, but does not implement " + missing + ".", defined,
+  defined.getName()
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py
new file mode 100644
index 000000000000..601ce2b18d0b
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrHash.py
@@ -0,0 +1,8 @@
+class A:
+    def __init__(self, a, b):
+        self.a = a 
+        self.b = b
+
+    # No equality method is defined
+    def __hash__(self):
+        return hash((self.a, self.b))
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py
new file mode 100644
index 000000000000..2f749ebeb9e3
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals1.py
@@ -0,0 +1,15 @@
+class A:
+    def __init__(self, a):
+        self.a = a 
+
+    # BAD: ne is defined, but not eq.
+    def __ne__(self, other):
+        if not isinstance(other, A):
+            return NotImplemented 
+        return self.a != other.a
+
+x = A(1)
+y = A(1)
+
+print(x == y) # Prints False (potentially unexpected - object identity is used)
+print(x != y) # Prints False
diff --git a/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py
new file mode 100644
index 000000000000..9b76a2536a58
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/EqualsOrNotEquals2.py
@@ -0,0 +1,21 @@
+class B:
+    def __init__(self, b):
+        self.b = b 
+    
+    def __eq__(self, other):
+        return self.b == other.b 
+    
+    def __ne__(self, other):
+        return self.b != other.b 
+    
+class C(B):
+    def __init__(self, b, c):
+        super().__init__(b)
+        self.c = c 
+
+    # BAD: eq is defined, but != will use superclass ne method, which is not consistent
+    def __eq__(self, other):
+        return self.b == other.b and self.c == other.c 
+    
+print(C(1,2) == C(1,3)) # Prints False 
+print(C(1,2) != C(1,3)) # Prints False (potentially unexpected)
\ No newline at end of file
diff --git a/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py b/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py
new file mode 100644
index 000000000000..5a18e3936209
--- /dev/null
+++ b/python/ql/src/Classes/Comparisons/examples/IncompleteOrdering.py
@@ -0,0 +1,8 @@
+class A:
+    def __init__(self, i):
+        self.i = i
+
+    # BAD: le is not defined, so `A(1) <= A(2)` would result in an error.
+    def __lt__(self, other):
+        return self.i < other.i
+    
\ No newline at end of file
diff --git a/python/ql/src/Classes/Equality.qll b/python/ql/src/Classes/Equality.qll
index 347f5057c38c..08162399e3e9 100644
--- a/python/ql/src/Classes/Equality.qll
+++ b/python/ql/src/Classes/Equality.qll
@@ -1,4 +1,7 @@
+/** Utility definitions for reasoning about equality methods. */
+
 import python
+import semmle.python.dataflow.new.DataFlow
 
 private Attribute dictAccess(LocalVariable var) {
   result.getName() = "__dict__" and
@@ -59,16 +62,28 @@ class IdentityEqMethod extends Function {
 /** An (in)equality method that delegates to its complement */
 class DelegatingEqualityMethod extends Function {
   DelegatingEqualityMethod() {
-    exists(Return ret, UnaryExpr not_, Compare comp, Cmpop op, Parameter p0, Parameter p1 |
+    exists(Return ret, UnaryExpr not_, Expr comp, Parameter p0, Parameter p1 |
       ret.getScope() = this and
       ret.getValue() = not_ and
       not_.getOp() instanceof Not and
-      not_.getOperand() = comp and
-      comp.compares(p0.getVariable().getAnAccess(), op, p1.getVariable().getAnAccess())
+      not_.getOperand() = comp
     |
-      this.getName() = "__eq__" and op instanceof NotEq
+      exists(Cmpop op |
+        comp.(Compare).compares(p0.getVariable().getAnAccess(), op, p1.getVariable().getAnAccess())
+      |
+        this.getName() = "__eq__" and op instanceof NotEq
+        or
+        this.getName() = "__ne__" and op instanceof Eq
+      )
       or
-      this.getName() = "__ne__" and op instanceof Eq
+      exists(DataFlow::MethodCallNode call, string name |
+        call.calls(DataFlow::exprNode(p0.getVariable().getAnAccess()), name) and
+        call.getArg(0).asExpr() = p1.getVariable().getAnAccess()
+      |
+        this.getName() = "__eq__" and name = "__ne__"
+        or
+        this.getName() = "__ne__" and name = "__eq__"
+      )
     )
   }
 }
diff --git a/python/ql/src/Classes/EqualsOrHash.py b/python/ql/src/Classes/EqualsOrHash.py
deleted file mode 100644
index e89c75b30ada..000000000000
--- a/python/ql/src/Classes/EqualsOrHash.py
+++ /dev/null
@@ -1,52 +0,0 @@
-# Incorrect: equality method defined but class contains no hash method
-class Point(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-
-# Improved: equality and hash method defined (inequality method still missing)
-class PointUpdated(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    def __hash__(self):  
-        return hash(self._x) ^ hash(self._y)
-
-# Improved: equality method defined and class instances made unhashable
-class UnhashablePoint(object):
-
-    def __init__(self, x, y):
-        self._x = x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    #Tell the interpreter that instances of this class cannot be hashed
-    __hash__ = None
-
diff --git a/python/ql/src/Classes/EqualsOrHash.qhelp b/python/ql/src/Classes/EqualsOrHash.qhelp
deleted file mode 100644
index 28579a095f70..000000000000
--- a/python/ql/src/Classes/EqualsOrHash.qhelp
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>In order to conform to the object model, classes that define their own equality method should also 
-define their own hash method, or be unhashable. If the hash method is not defined then the <code>hash</code> of the 
-super class is used. This is unlikely to result in the expected behavior.</p>
-
-<p>A class can be made unhashable by setting its <code>__hash__</code> attribute to <code>None</code>.</p>
-
-<p>In Python 3, if you define a class-level equality method and omit a <code>__hash__</code> method 
-then the class is automatically marked as unhashable.</p>
-
-</overview>
-<recommendation>
-
-<p>When you define an <code>__eq__</code> method for a class, remember to implement a <code>__hash__</code> method or set 
-<code>__hash__ = None</code>.</p>
-
-</recommendation>
-<example>
-<p>In the following example the <code>Point</code> class defines an equality method but 
-no hash method. If hash is called on this class then the hash method defined for <code>object</code> 
-is used. This is unlikely to give the required behavior. The <code>PointUpdated</code> class 
-is better as it defines both an equality and a hash method.
-If <code>Point</code> was not to be used in <code>dict</code>s or <code>set</code>s, then it could be defined as
-<code>UnhashablePoint</code> below.
-</p>
-<p>
-To comply fully with the object model this class should also define an inequality method (identified 
-by a separate rule).</p>
-
-<sample src="EqualsOrHash.py" />
-
-</example>
-<references>
-
-
-<li>Python Language Reference: <a href="http://docs.python.org/reference/datamodel.html#object.__hash__">object.__hash__</a>.</li>
-<li>Python Glossary: <a href="http://docs.python.org/2/glossary.html#term-hashable">hashable</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/EqualsOrHash.ql b/python/ql/src/Classes/EqualsOrHash.ql
deleted file mode 100644
index 4c8cf2c11699..000000000000
--- a/python/ql/src/Classes/EqualsOrHash.ql
+++ /dev/null
@@ -1,63 +0,0 @@
-/**
- * @name Inconsistent equality and hashing
- * @description Defining equality for a class without also defining hashability (or vice-versa) violates the object model.
- * @kind problem
- * @tags quality
- *       reliability
- *       correctness
- *       external/cwe/cwe-581
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/equals-hash-mismatch
- */
-
-import python
-
-CallableValue defines_equality(ClassValue c, string name) {
-  (
-    name = "__eq__"
-    or
-    major_version() = 2 and name = "__cmp__"
-  ) and
-  result = c.declaredAttribute(name)
-}
-
-CallableValue implemented_method(ClassValue c, string name) {
-  result = defines_equality(c, name)
-  or
-  result = c.declaredAttribute("__hash__") and name = "__hash__"
-}
-
-string unimplemented_method(ClassValue c) {
-  not exists(defines_equality(c, _)) and
-  (
-    result = "__eq__" and major_version() = 3
-    or
-    major_version() = 2 and result = "__eq__ or __cmp__"
-  )
-  or
-  /* Python 3 automatically makes classes unhashable if __eq__ is defined, but __hash__ is not */
-  not c.declaresAttribute(result) and result = "__hash__" and major_version() = 2
-}
-
-/** Holds if this class is unhashable */
-predicate unhashable(ClassValue cls) {
-  cls.lookup("__hash__") = Value::named("None")
-  or
-  cls.lookup("__hash__").(CallableValue).neverReturns()
-}
-
-predicate violates_hash_contract(ClassValue c, string present, string missing, Value method) {
-  not unhashable(c) and
-  missing = unimplemented_method(c) and
-  method = implemented_method(c, present) and
-  not c.failedInference(_)
-}
-
-from ClassValue c, string present, string missing, CallableValue method
-where
-  violates_hash_contract(c, present, missing, method) and
-  exists(c.getScope()) // Suppress results that aren't from source
-select method, "Class $@ implements " + present + " but does not define " + missing + ".", c,
-  c.getName()
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.py b/python/ql/src/Classes/EqualsOrNotEquals.py
deleted file mode 100644
index 7e1ece7685c5..000000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.py
+++ /dev/null
@@ -1,32 +0,0 @@
-class PointOriginal(object):
-
-    def __init__(self, x, y):
-        self._x, x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):  # Incorrect: equality is defined but inequality is not
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-
-class PointUpdated(object):
-
-    def __init__(self, x, y):
-        self._x, x
-        self._y = y
-
-    def __repr__(self):
-        return 'Point(%r, %r)' % (self._x, self._y)
-
-    def __eq__(self, other):
-        if not isinstance(other, Point):
-            return False
-        return self._x == other._x and self._y == other._y
-
-    def __ne__(self, other):  # Improved: equality and inequality method defined (hash method still missing)
-        return not self == other
-
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.qhelp b/python/ql/src/Classes/EqualsOrNotEquals.qhelp
deleted file mode 100644
index c49f3d2529ed..000000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.qhelp
+++ /dev/null
@@ -1,37 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-
-<overview>
-<p>In order to conform to the object model, classes should define either no equality methods, or both 
-an equality and an inequality method. If only one of <code>__eq__</code> or <code>__ne__</code> is 
-defined then the method from the super class is used. This is unlikely to result in the expected 
-behavior.</p>
-
-</overview>
-<recommendation>
-
-<p>When you define an equality or an inequality method for a class, remember to implement both an 
-<code>__eq__</code> method and an <code>__ne__</code> method.</p>
-
-</recommendation>
-<example>
-<p>In the following example the <code>PointOriginal</code> class defines an equality method but 
-no inequality method. If this class is tested for inequality then a type error will be raised. The 
-<code>PointUpdated</code> class is better as it defines both an equality and an inequality method. To
-comply fully with the object model this class should also define a hash method (identified by
-a separate rule).</p>
-
-<sample src="EqualsOrNotEquals.py" />
-
-</example>
-<references>
-
-
-<li>Python Language Reference: <a href="http://docs.python.org/2/reference/datamodel.html#object.__ne__">object.__ne__</a>, 
-<a href="http://docs.python.org/2/reference/expressions.html#comparisons">Comparisons</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/EqualsOrNotEquals.ql b/python/ql/src/Classes/EqualsOrNotEquals.ql
deleted file mode 100644
index adac5a20e87a..000000000000
--- a/python/ql/src/Classes/EqualsOrNotEquals.ql
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @name Inconsistent equality and inequality
- * @description Defining only an equality method or an inequality method for a class violates the object model.
- * @kind problem
- * @tags reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity high
- * @precision very-high
- * @id py/inconsistent-equality
- */
-
-import python
-import Equality
-
-string equals_or_ne() { result = "__eq__" or result = "__ne__" }
-
-predicate total_ordering(Class cls) {
-  exists(Attribute a | a = cls.getADecorator() | a.getName() = "total_ordering")
-  or
-  exists(Name n | n = cls.getADecorator() | n.getId() = "total_ordering")
-}
-
-CallableValue implemented_method(ClassValue c, string name) {
-  result = c.declaredAttribute(name) and name = equals_or_ne()
-}
-
-string unimplemented_method(ClassValue c) {
-  not c.declaresAttribute(result) and result = equals_or_ne()
-}
-
-predicate violates_equality_contract(
-  ClassValue c, string present, string missing, CallableValue method
-) {
-  missing = unimplemented_method(c) and
-  method = implemented_method(c, present) and
-  not c.failedInference(_) and
-  not total_ordering(c.getScope()) and
-  /* Python 3 automatically implements __ne__ if __eq__ is defined, but not vice-versa */
-  not (major_version() = 3 and present = "__eq__" and missing = "__ne__") and
-  not method.getScope() instanceof DelegatingEqualityMethod and
-  not c.lookup(missing).(CallableValue).getScope() instanceof DelegatingEqualityMethod
-}
-
-from ClassValue c, string present, string missing, CallableValue method
-where violates_equality_contract(c, present, missing, method)
-select method, "Class $@ implements " + present + " but does not implement " + missing + ".", c,
-  c.getName()
diff --git a/python/ql/src/Classes/IncompleteOrdering.py b/python/ql/src/Classes/IncompleteOrdering.py
deleted file mode 100644
index 78b306880b03..000000000000
--- a/python/ql/src/Classes/IncompleteOrdering.py
+++ /dev/null
@@ -1,6 +0,0 @@
-class IncompleteOrdering(object):
-    def __init__(self, i):
-        self.i = i
-
-    def __lt__(self, other):
-        return self.i < other.i
\ No newline at end of file
diff --git a/python/ql/src/Classes/IncompleteOrdering.qhelp b/python/ql/src/Classes/IncompleteOrdering.qhelp
deleted file mode 100644
index 7983985ccee0..000000000000
--- a/python/ql/src/Classes/IncompleteOrdering.qhelp
+++ /dev/null
@@ -1,35 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-<p> A class that implements an ordering operator
-(<code>__lt__</code>, <code>__gt__</code>, <code>__le__</code> or <code>__ge__</code>) should implement
-all four in order that ordering between two objects is consistent and obeys the usual mathematical rules.
-If the ordering is inconsistent with default equality, then <code>__eq__</code> and  <code>__ne__</code>
-should also be implemented.
-</p>
-
-</overview>
-<recommendation>
-<p>Ensure that all four ordering comparisons are implemented as well as <code>__eq__</code> and <code>
-__ne__</code> if required.</p>
-
-<p>It is not necessary to manually implement all four comparisons,
-the <code>functools.total_ordering</code> class decorator can be used.</p>
-
-</recommendation>
-<example>
-<p>In this example only the <code>__lt__</code> operator has been implemented which could lead to
-inconsistent behavior. <code>__gt__</code>, <code>__le__</code>, <code>__ge__</code>, and in this case,
-<code>__eq__</code> and <code>__ne__</code> should be implemented.</p>
-<sample src="IncompleteOrdering.py" />
-
-</example>
-<references>
-
-  <li>Python Language Reference: <a href="http://docs.python.org/2/reference/datamodel.html#object.__lt__">Rich comparisons in Python</a>.</li>
-
-
-</references>
-</qhelp>
diff --git a/python/ql/src/Classes/IncompleteOrdering.ql b/python/ql/src/Classes/IncompleteOrdering.ql
deleted file mode 100644
index d6cd1230ece6..000000000000
--- a/python/ql/src/Classes/IncompleteOrdering.ql
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * @name Incomplete ordering
- * @description Class defines one or more ordering method but does not define all 4 ordering comparison methods
- * @kind problem
- * @tags reliability
- *       correctness
- * @problem.severity warning
- * @sub-severity low
- * @precision very-high
- * @id py/incomplete-ordering
- */
-
-import python
-
-predicate total_ordering(Class cls) {
-  exists(Attribute a | a = cls.getADecorator() | a.getName() = "total_ordering")
-  or
-  exists(Name n | n = cls.getADecorator() | n.getId() = "total_ordering")
-}
-
-string ordering_name(int n) {
-  result = "__lt__" and n = 1
-  or
-  result = "__le__" and n = 2
-  or
-  result = "__gt__" and n = 3
-  or
-  result = "__ge__" and n = 4
-}
-
-predicate overrides_ordering_method(ClassValue c, string name) {
-  name = ordering_name(_) and
-  (
-    c.declaresAttribute(name)
-    or
-    exists(ClassValue sup | sup = c.getASuperType() and not sup = Value::named("object") |
-      sup.declaresAttribute(name)
-    )
-  )
-}
-
-string unimplemented_ordering(ClassValue c, int n) {
-  not c = Value::named("object") and
-  not overrides_ordering_method(c, result) and
-  result = ordering_name(n)
-}
-
-string unimplemented_ordering_methods(ClassValue c, int n) {
-  n = 0 and result = "" and exists(unimplemented_ordering(c, _))
-  or
-  exists(string prefix, int nm1 | n = nm1 + 1 and prefix = unimplemented_ordering_methods(c, nm1) |
-    prefix = "" and result = unimplemented_ordering(c, n)
-    or
-    result = prefix and not exists(unimplemented_ordering(c, n)) and n < 5
-    or
-    prefix != "" and result = prefix + " or " + unimplemented_ordering(c, n)
-  )
-}
-
-Value ordering_method(ClassValue c, string name) {
-  /* If class doesn't declare a method then don't blame this class (the superclass will be blamed). */
-  name = ordering_name(_) and result = c.declaredAttribute(name)
-}
-
-from ClassValue c, Value ordering, string name
-where
-  not c.failedInference(_) and
-  not total_ordering(c.getScope()) and
-  ordering = ordering_method(c, name) and
-  exists(unimplemented_ordering(c, _))
-select c,
-  "Class " + c.getName() + " implements $@, but does not implement " +
-    unimplemented_ordering_methods(c, 4) + ".", ordering, name
diff --git a/python/ql/src/Classes/SubclassShadowing.py b/python/ql/src/Classes/SubclassShadowing.py
deleted file mode 100644
index 617db3c58e0b..000000000000
--- a/python/ql/src/Classes/SubclassShadowing.py
+++ /dev/null
@@ -1,17 +0,0 @@
-class Mammal(object):
-
-    def __init__(self, milk = 0):
-        self.milk = milk
-
-
-class Cow(Mammal):
-
-    def __init__(self):
-        Mammal.__init__(self)
-
-    def milk(self):
-        return "Milk"
-
-#Cow().milk() will raise an error as Cow().milk is the 'milk' attribute
-#set in Mammal.__init__, not the 'milk' method defined on Cow.
-
diff --git a/python/ql/src/Classes/SubclassShadowing.qhelp b/python/ql/src/Classes/SubclassShadowing.qhelp
deleted file mode 100644
index 90daa9a992ab..000000000000
--- a/python/ql/src/Classes/SubclassShadowing.qhelp
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE qhelp PUBLIC
-  "-//Semmle//qhelp//EN"
-  "qhelp.dtd">
-<qhelp>
-<overview>
-<p> Subclass shadowing occurs when an instance attribute of a superclass has the
-the same name as a method of a subclass, or vice-versa.
-The semantics of Python attribute look-up mean that the instance attribute of
-the superclass hides the method in the subclass.
-</p>
-
-</overview>
-<recommendation>
-
-<p>Rename the method in the subclass or rename the attribute in the superclass.</p>
-
-</recommendation>
-<example>
-<p>The following code includes an example of subclass shadowing. When you call <code>Cow().milk()</code> 
-an error is raised because <code>Cow().milk</code> is interpreted as the 'milk' attribute set in 
-<code>Mammal.__init__</code>, not the 'milk' method defined within <code>Cow</code>. This can be fixed 
-by changing the name of either the 'milk' attribute or the 'milk' method.</p>
-
-<sample src="SubclassShadowing.py" />
-
-</example>
-</qhelp>
diff --git a/python/ql/src/Classes/SubclassShadowing.ql b/python/ql/src/Classes/SubclassShadowing.ql
deleted file mode 100644
index 542cf31c76aa..000000000000
--- a/python/ql/src/Classes/SubclassShadowing.ql
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * @name Superclass attribute shadows subclass method
- * @description Defining an attribute in a superclass method with a name that matches a subclass
- *              method, hides the method in the subclass.
- * @kind problem
- * @problem.severity error
- * @tags quality
- *       reliability
- *       correctness
- * @sub-severity low
- * @precision high
- * @id py/attribute-shadows-method
- */
-
-/*
- * Determine if a class defines a method that is shadowed by an attribute
- *   defined in a super-class
- */
-
-/* Need to find attributes defined in superclass (only in __init__?) */
-import python
-
-predicate shadowed_by_super_class(
-  ClassObject c, ClassObject supercls, Assign assign, FunctionObject f
-) {
-  c.getASuperType() = supercls and
-  c.declaredAttribute(_) = f and
-  exists(FunctionObject init, Attribute attr |
-    supercls.declaredAttribute("__init__") = init and
-    attr = assign.getATarget() and
-    attr.getObject().(Name).getId() = "self" and
-    attr.getName() = f.getName() and
-    assign.getScope() = init.getOrigin().(FunctionExpr).getInnerScope()
-  ) and
-  /*
-   * It's OK if the super class defines the method as well.
-   * We assume that the original method must have been defined for a reason.
-   */
-
-  not supercls.hasAttribute(f.getName())
-}
-
-from ClassObject c, ClassObject supercls, Assign assign, FunctionObject shadowed
-where shadowed_by_super_class(c, supercls, assign, shadowed)
-select shadowed.getOrigin(),
-  "Method " + shadowed.getName() + " is shadowed by an $@ in super class '" + supercls.getName() +
-    "'.", assign, "attribute"
diff --git a/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp
new file mode 100644
index 000000000000..b45938cc28d1
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.qhelp
@@ -0,0 +1,39 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+<overview>
+<p>
+When an object has an attribute that shares its name with a method on the object's class (or another class attribute), the instance attribute is 
+prioritized during attribute lookup, shadowing the method.  
+
+If a method on a subclass is shadowed by an attribute on a superclass in this way, this may lead to unexpected results or errors, as this
+shadowing behavior is nonlocal and may be unintended.
+</p>
+
+</overview>
+<recommendation>
+
+<p>
+Ensure method names on subclasses don't conflict with attribute names on superclasses, and rename one.  
+If the shadowing behavior is intended, ensure this is explicit in the superclass.
+</p>
+
+</recommendation>
+<example>
+<p>
+In the following example, the <code>_foo</code> attribute of class <code>A</code> shadows the method <code>_foo</code> of class <code>B</code>. 
+Calls to <code>B()._foo()</code> will result in a <code>TypeError</code>, as <code>3</code> will be called instead. 
+</p>
+
+<sample src="examples/SubclassShadowingBad.py" />
+
+<p>
+In the following example, the behavior of the <code>default</code> attribute being shadowed to allow for customization during initialization is
+intended in within the superclass <code>A</code>. Overriding <code>default</code> in the subclass <code>B</code> is then OK.
+</p>
+
+<sample src="examples/SubclassShadowingGood.py" />
+
+</example>
+</qhelp>
diff --git a/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
new file mode 100644
index 000000000000..39a320f75ac6
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/SubclassShadowing.ql
@@ -0,0 +1,71 @@
+/**
+ * @name Superclass attribute shadows subclass method
+ * @description Defining an attribute in a superclass method with a name that matches a subclass
+ *              method, hides the method in the subclass.
+ * @kind problem
+ * @problem.severity error
+ * @tags quality
+ *       reliability
+ *       correctness
+ * @sub-severity low
+ * @precision high
+ * @id py/attribute-shadows-method
+ */
+
+import python
+import semmle.python.ApiGraphs
+import semmle.python.dataflow.new.internal.DataFlowDispatch
+
+predicate isSettableProperty(Function prop) {
+  isProperty(prop) and
+  exists(Function setter |
+    setter.getScope() = prop.getScope() and
+    setter.getName() = prop.getName() and
+    isSetter(setter)
+  )
+}
+
+predicate isSetter(Function f) {
+  exists(DataFlow::AttrRead attr |
+    f.getADecorator() = attr.asExpr() and
+    attr.getAttributeName() = "setter"
+  )
+}
+
+predicate isProperty(Function prop) {
+  prop.getADecorator() = API::builtin("property").asSource().asExpr()
+}
+
+predicate shadowedBySuperclass(
+  Class cls, Class superclass, DataFlow::AttrWrite write, Function shadowed
+) {
+  getADirectSuperclass+(cls) = superclass and
+  shadowed = cls.getAMethod() and
+  exists(Function init |
+    init = superclass.getInitMethod() and
+    DataFlow::parameterNode(init.getArg(0)).(DataFlow::LocalSourceNode).flowsTo(write.getObject()) and
+    write.getAttributeName() = shadowed.getName()
+  ) and
+  // Allow cases in which the super class defines the method as well.
+  // We assume that the original method must have been defined for a reason.
+  not exists(Function superShadowed |
+    superShadowed = superclass.getAMethod() and
+    superShadowed.getName() = shadowed.getName()
+  ) and
+  // Allow properties if they have setters, as the write in the superclass will call the setter.
+  not isSettableProperty(shadowed) and
+  not isSetter(shadowed)
+}
+
+from Class cls, Class superclass, DataFlow::AttrWrite write, Function shadowed, string extra
+where
+  shadowedBySuperclass(cls, superclass, write, shadowed) and
+  (
+    if isProperty(shadowed)
+    then
+      // it's not a setter, so it's a read-only property
+      extra = " (read-only property may cause an error if written to in the superclass)"
+    else extra = ""
+  )
+select shadowed, "This method is shadowed by $@ in superclass $@." + extra, write,
+  "attribute " + write.getAttributeName(), superclass, superclass.getName()
diff --git a/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py
new file mode 100644
index 000000000000..00a221760b4c
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingBad.py
@@ -0,0 +1,9 @@
+class A:
+    def __init__(self):
+        self._foo = 3
+
+class B(A):
+    # BAD: _foo is shadowed by attribute A._foo
+    def _foo(self):
+        return 2
+
diff --git a/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py
new file mode 100644
index 000000000000..8fca041176ca
--- /dev/null
+++ b/python/ql/src/Classes/SubclassShadowing/examples/SubclassShadowingGood.py
@@ -0,0 +1,15 @@
+class A:
+    def __init__(self, default_func=None):
+        if default_func is not None:
+            self.default = default_func 
+
+    # GOOD: The shadowing behavior is explicitly intended in the superclass.
+    def default(self):
+        return []
+    
+class B(A):
+    
+    # Subclasses may override the method `default`, which will still be shadowed by the attribute `default` if it is set.
+    # As this is part of the expected behavior of the superclass, this is fine. 
+    def default(self):
+        return {}
\ No newline at end of file
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py
deleted file mode 100644
index e76c27145dbb..000000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#Incorrect unhashable class
-class MyMutableThing(object):
-    
-    def __init__(self):
-        pass
-    
-    def __hash__(self):
-        raise NotImplementedError("%r is unhashable" % self)
-
-#Make class unhashable in the standard way
-class MyCorrectMutableThing(object):
-    
-    def __init__(self):
-        pass
-    
-    __hash__ = None
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
index f4f0cd6920ab..ff3de29c90a7 100644
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
+++ b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.qhelp
@@ -5,11 +5,11 @@
 <overview>
 <p>User-defined classes interact with the Python virtual machine via special methods (also called "magic methods").
 For example, for a class to support addition it must implement the <code>__add__</code> and <code>__radd__</code> special methods.
-When the expression <code>a + b</code> is evaluated the Python virtual machine will call <code>type(a).__add__(a, b)</code> and if that
+When the expression <code>a + b</code> is evaluated, the Python virtual machine will call <code>type(a).__add__(a, b)</code>, and if that
 is not implemented it will call <code>type(b).__radd__(b, a)</code>.</p>
 <p>
 Since the virtual machine calls these special methods for common expressions, users of the class will expect these operations to raise standard exceptions.
-For example, users would expect that the expression <code>a.b</code> might raise an <code>AttributeError</code>
+For example, users would expect that the expression <code>a.b</code> may raise an <code>AttributeError</code>
 if the object <code>a</code> does not have an attribute <code>b</code>.
 If a <code>KeyError</code> were raised instead,
 then this would be unexpected and may break code that expected an <code>AttributeError</code>, but not a <code>KeyError</code>.
@@ -20,50 +20,48 @@ Therefore, if a method is unable to perform the expected operation then its resp
 </p>
 
 <ul>
-    <li>Attribute access, <code>a.b</code>: Raise <code>AttributeError</code></li>
-    <li>Arithmetic operations, <code>a + b</code>: Do not raise an exception, return <code>NotImplemented</code> instead.</li>
-    <li>Indexing, <code>a[b]</code>: Raise <code>KeyError</code>.</li>
-    <li>Hashing, <code>hash(a)</code>: Use <code>__hash__ = None</code> to indicate that an object is unhashable.</li>
-    <li>Equality methods, <code>a != b</code>: Never raise an exception, always return <code>True</code> or <code>False</code>.</li>
-    <li>Ordering comparison methods, <code>a &lt; b</code>: Raise a <code>TypeError</code> if the objects cannot be ordered.</li>
-    <li>Most others: Ideally, do not implement the method at all, otherwise raise <code>TypeError</code> to indicate that the operation is unsupported.</li>
+    <li>Attribute access, <code>a.b</code> (<code>__getattr__</code>): Raise <code>AttributeError</code>.</li>
+    <li>Arithmetic operations, <code>a + b</code> (<code>__add__</code>): Do not raise an exception, return <code>NotImplemented</code> instead.</li>
+    <li>Indexing, <code>a[b]</code> (<code>__getitem__</code>): Raise <code>KeyError</code> or <code>IndexError</code>.</li>
+    <li>Hashing, <code>hash(a)</code> (<code>__hash__</code>): Should not raise an exception. Use <code>__hash__ = None</code> to indicate that an object is unhashable rather than raising an exception.</li>
+    <li>Equality methods, <code>a == b</code> (<code>__eq__</code>): Never raise an exception, always return <code>True</code> or <code>False</code>.</li>
+    <li>Ordering comparison methods, <code>a &lt; b</code> (<code>__lt__</code>): Raise a <code>TypeError</code> if the objects cannot be ordered.</li>
+    <li>Most others: If the operation is never supported, the method often does not need to be implemented at all; otherwise a <code>TypeError</code> should be raised.</li>
 </ul>
 
 </overview>
 <recommendation>
-<p>If the method is meant to be abstract, then declare it so using the <code>@abstractmethod</code> decorator.
-Otherwise, either remove the method or ensure that the method raises an exception of the correct type.
+<p>If the method always raises as exception, then if it is intended to be an abstract method, the <code>@abstractmethod</code> decorator should be used.
+Otherwise, ensure that the method raises an exception of the correct type, or remove the method if the operation does not need to be supported.
 </p>
 
 </recommendation>
 <example>
 
 <p>
-This example shows two unhashable classes. The first class is unhashable in a non-standard way which may cause maintenance problems.
-The second, corrected, class uses the standard idiom for unhashable classes.
+In the following example, the <code>__add__</code> method of <code>A</code> raises a <code>TypeError</code> if <code>other</code> is of the wrong type.
+However, it should return <code>NotImplemented</code> instead of rising an exception, to allow other classes to support adding to <code>A</code>.
+This is demonstrated in the class <code>B</code>.
 </p>
-<sample src="IncorrectRaiseInSpecialMethod.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod.py" />
 <p>
-In this example, the first class is implicitly abstract; the <code>__add__</code> method is unimplemented,
-presumably with the expectation that it will be implemented by sub-classes.
-The second class makes this explicit with an <code>@abstractmethod</code> decoration on the unimplemented  <code>__add__</code> method.
+In the following example, the <code>__getitem__</code> method of <code>C</code> raises a <code>ValueError</code>, rather than a <code>KeyError</code> or <code>IndexError</code> as expected.
 </p>
-<sample src="IncorrectRaiseInSpecialMethod2.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod2.py" />
 <p>
-In this last example, the first class implements a collection backed by the file store.
-However, should an <code>IOError</code> be raised in the <code>__getitem__</code> it will propagate to the caller.
-The second class handles any <code>IOError</code> by reraising a <code>KeyError</code> which is the standard exception for
-the <code>__getitem__</code> method.
+In the following example, the class <code>__hash__</code> method of <code>D</code> raises <code>NotImplementedError</code>. 
+This causes <code>D</code> to be incorrectly identified as hashable by <code>isinstance(obj, collections.abc.Hashable)</code>; so the correct 
+way to make a class unhashable is to set <code>__hash__ = None</code>.
 </p>
 
-<sample src="IncorrectRaiseInSpecialMethod3.py" />
+<sample src="examples/IncorrectRaiseInSpecialMethod3.py" />
 
 
 </example>
 <references>
 
 <li>Python Language Reference: <a href="http://docs.python.org/dev/reference/datamodel.html#special-method-names">Special Method Names</a>.</li>
-<li>Python Library Reference: <a href="https://docs.python.org/2/library/exceptions.html">Exceptions</a>.</li>
+<li>Python Library Reference: <a href="https://docs.python.org/3/library/exceptions.html">Exceptions</a>.</li>
 
 
 
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
index 4bf52af9061f..3cd7e0fe9871 100644
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
+++ b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod.ql
@@ -7,114 +7,188 @@
  *       error-handling
  * @problem.severity recommendation
  * @sub-severity high
- * @precision very-high
+ * @precision high
  * @id py/unexpected-raise-in-special-method
  */
 
 import python
+import semmle.python.ApiGraphs
+import semmle.python.dataflow.new.internal.DataFlowDispatch
 
-private predicate attribute_method(string name) {
-  name = "__getattribute__" or name = "__getattr__" or name = "__setattr__"
+/** Holds if `name` is the name of a special method for attribute access such as `a.b`, that should raise an `AttributeError`. */
+private predicate attributeMethod(string name) {
+  name = ["__getattribute__", "__getattr__", "__delattr__"] // __setattr__ excluded as it makes sense to raise different kinds of errors based on the `value` parameter
 }
 
-private predicate indexing_method(string name) {
-  name = "__getitem__" or name = "__setitem__" or name = "__delitem__"
+/** Holds if `name` is the name of a special method for indexing operations such as `a[b]`, that should raise a `LookupError`. */
+private predicate indexingMethod(string name) {
+  name = ["__getitem__", "__delitem__"] // __setitem__ excluded as it makes sense to raise different kinds of errors based on the `value` parameter
 }
 
-private predicate arithmetic_method(string name) {
-  name in [
-      "__add__", "__sub__", "__or__", "__xor__", "__rshift__", "__pow__", "__mul__", "__neg__",
-      "__radd__", "__rsub__", "__rdiv__", "__rfloordiv__", "__div__", "__rdiv__", "__rlshift__",
-      "__rand__", "__ror__", "__rxor__", "__rrshift__", "__rpow__", "__rmul__", "__truediv__",
-      "__rtruediv__", "__pos__", "__iadd__", "__isub__", "__idiv__", "__ifloordiv__", "__idiv__",
-      "__ilshift__", "__iand__", "__ior__", "__ixor__", "__irshift__", "__abs__", "__ipow__",
-      "__imul__", "__itruediv__", "__floordiv__", "__div__", "__divmod__", "__lshift__", "__and__"
+/** Holds if `name` is the name of a special method for arithmetic operations. */
+private predicate arithmeticMethod(string name) {
+  name =
+    [
+      "__add__", "__sub__", "__and__", "__or__", "__xor__", "__lshift__", "__rshift__", "__pow__",
+      "__mul__", "__div__", "__divmod__", "__truediv__", "__floordiv__", "__matmul__", "__radd__",
+      "__rsub__", "__rand__", "__ror__", "__rxor__", "__rlshift__", "__rrshift__", "__rpow__",
+      "__rmul__", "__rdiv__", "__rdivmod__", "__rtruediv__", "__rfloordiv__", "__rmatmul__",
+      "__iadd__", "__isub__", "__iand__", "__ior__", "__ixor__", "__ilshift__", "__irshift__",
+      "__ipow__", "__imul__", "__idiv__", "__idivmod__", "__itruediv__", "__ifloordiv__",
+      "__imatmul__", "__pos__", "__neg__", "__abs__", "__invert__",
     ]
 }
 
-private predicate ordering_method(string name) {
-  name = "__lt__"
-  or
-  name = "__le__"
-  or
-  name = "__gt__"
-  or
-  name = "__ge__"
-  or
-  name = "__cmp__" and major_version() = 2
+/** Holds if `name is the name of a special method for ordering operations such as `a < b`. */
+private predicate orderingMethod(string name) {
+  name =
+    [
+      "__lt__",
+      "__le__",
+      "__gt__",
+      "__ge__",
+    ]
 }
 
-private predicate cast_method(string name) {
-  name = "__nonzero__" and major_version() = 2
-  or
-  name = "__int__"
-  or
-  name = "__float__"
-  or
-  name = "__long__"
-  or
-  name = "__trunc__"
-  or
-  name = "__complex__"
+/** Holds if `name` is the name of a special method for casting an object to a numeric type, such as `int(x)` */
+private predicate castMethod(string name) {
+  name =
+    [
+      "__int__",
+      "__float__",
+      "__index__",
+      "__trunc__",
+      "__complex__"
+    ] // __bool__ excluded as it makes sense to allow it to always raise
 }
 
-predicate correct_raise(string name, ClassObject ex) {
-  ex.getAnImproperSuperType() = theTypeErrorType() and
+/** Holds if we allow a special method named `name` to raise `exec` as an exception. */
+predicate correctRaise(string name, Expr exec) {
+  execIsOfType(exec, "TypeError") and
   (
-    name = "__copy__" or
-    name = "__deepcopy__" or
-    name = "__call__" or
-    indexing_method(name) or
-    attribute_method(name)
+    indexingMethod(name) or
+    attributeMethod(name) or
+    // Allow add methods to raise a TypeError, as they can be used for sequence concatenation as well as arithmetic
+    name = ["__add__", "__iadd__", "__radd__"]
   )
   or
-  preferred_raise(name, ex)
-  or
-  preferred_raise(name, ex.getASuperType())
+  exists(string execName |
+    preferredRaise(name, execName, _) and
+    execIsOfType(exec, execName)
+  )
 }
 
-predicate preferred_raise(string name, ClassObject ex) {
-  attribute_method(name) and ex = theAttributeErrorType()
-  or
-  indexing_method(name) and ex = Object::builtin("LookupError")
-  or
-  ordering_method(name) and ex = theTypeErrorType()
-  or
-  arithmetic_method(name) and ex = Object::builtin("ArithmeticError")
-  or
-  name = "__bool__" and ex = theTypeErrorType()
+/** Holds if it is preferred for `name` to raise exceptions of type `execName`. `message` is the alert message. */
+predicate preferredRaise(string name, string execName, string message) {
+  attributeMethod(name) and
+  execName = "AttributeError" and
+  message = "should raise an AttributeError instead."
+  or
+  indexingMethod(name) and
+  execName = "LookupError" and
+  message = "should raise a LookupError (KeyError or IndexError) instead."
+  or
+  orderingMethod(name) and
+  execName = "TypeError" and
+  message = "should raise a TypeError or return NotImplemented instead."
+  or
+  arithmeticMethod(name) and
+  execName = "ArithmeticError" and
+  message = "should raise an ArithmeticError or return NotImplemented instead."
+  or
+  name = "__bool__" and
+  execName = "TypeError" and
+  message = "should raise a TypeError instead."
 }
 
-predicate no_need_to_raise(string name, string message) {
-  name = "__hash__" and message = "use __hash__ = None instead"
-  or
-  cast_method(name) and message = "there is no need to implement the method at all."
+/** Holds if `exec` is an exception object of the type named `execName`. */
+predicate execIsOfType(Expr exec, string execName) {
+  // Might make sense to have execName be an IPA type here. Or part of a more general API modeling builtin/stdlib subclass relations.
+  exists(string subclass |
+    execName = "TypeError" and
+    subclass = "TypeError"
+    or
+    execName = "LookupError" and
+    subclass = ["LookupError", "KeyError", "IndexError"]
+    or
+    execName = "ArithmeticError" and
+    subclass = ["ArithmeticError", "FloatingPointError", "OverflowError", "ZeroDivisionError"]
+    or
+    execName = "AttributeError" and
+    subclass = "AttributeError"
+  |
+    exec = API::builtin(subclass).getACall().asExpr()
+    or
+    exec = API::builtin(subclass).getASubclass().getACall().asExpr()
+  )
+}
+
+/**
+ * Holds if `meth` need not be implemented if it always raises. `message` is the alert message, and `allowNotImplemented` is true
+ * if we still allow the method to always raise `NotImplementedError`.
+ */
+predicate noNeedToAlwaysRaise(Function meth, string message, boolean allowNotImplemented) {
+  meth.getName() = "__hash__" and
+  message = "use __hash__ = None instead." and
+  allowNotImplemented = false
+  or
+  castMethod(meth.getName()) and
+  message = "this method does not need to be implemented." and
+  allowNotImplemented = true and
+  // Allow an always raising cast method if it's overriding other behavior
+  not exists(Function overridden |
+    overridden.getName() = meth.getName() and
+    overridden.getScope() = getADirectSuperclass+(meth.getScope()) and
+    not alwaysRaises(overridden, _)
+  )
+}
+
+/** Holds if `func` has a decorator likely marking it as an abstract method. */
+predicate isAbstract(Function func) { func.getADecorator().(Name).getId().matches("%abstract%") }
+
+/** Holds if `f` always raises the exception `exec`. */
+predicate alwaysRaises(Function f, Expr exec) {
+  directlyRaises(f, exec) and
+  strictcount(Expr e | directlyRaises(f, e)) = 1 and
+  not exists(f.getANormalExit())
 }
 
-predicate is_abstract(FunctionObject func) {
-  func.getFunction().getADecorator().(Name).getId().matches("%abstract%")
+/** Holds if `f` directly raises `exec` using a `raise` statement. */
+predicate directlyRaises(Function f, Expr exec) {
+  exists(Raise r |
+    r.getScope() = f and
+    exec = r.getException() and
+    exec instanceof Call
+  )
 }
 
-predicate always_raises(FunctionObject f, ClassObject ex) {
-  ex = f.getARaisedType() and
-  strictcount(f.getARaisedType()) = 1 and
-  not exists(f.getFunction().getANormalExit()) and
-  /* raising StopIteration is equivalent to a return in a generator */
-  not ex = theStopIterationType()
+/** Holds if `exec` is a `NotImplementedError`. */
+predicate isNotImplementedError(Expr exec) {
+  exec = API::builtin("NotImplementedError").getACall().asExpr()
 }
 
-from FunctionObject f, ClassObject cls, string message
+/** Gets the name of the builtin exception type `exec` constructs, if it can be determined. */
+string getExecName(Expr exec) { result = exec.(Call).getFunc().(Name).getId() }
+
+from Function f, Expr exec, string message
 where
-  f.getFunction().isSpecialMethod() and
-  not is_abstract(f) and
-  always_raises(f, cls) and
+  f.isSpecialMethod() and
+  not isAbstract(f) and
+  directlyRaises(f, exec) and
   (
-    no_need_to_raise(f.getName(), message) and not cls.getName() = "NotImplementedError"
+    exists(boolean allowNotImplemented, string subMessage |
+      alwaysRaises(f, exec) and
+      noNeedToAlwaysRaise(f, subMessage, allowNotImplemented) and
+      (allowNotImplemented = true implies not isNotImplementedError(exec)) and // don't alert if it's a NotImplementedError and that's ok
+      message = "This method always raises $@ - " + subMessage
+    )
     or
-    not correct_raise(f.getName(), cls) and
-    not cls.getName() = "NotImplementedError" and
-    exists(ClassObject preferred | preferred_raise(f.getName(), preferred) |
-      message = "raise " + preferred.getName() + " instead"
+    not isNotImplementedError(exec) and
+    not correctRaise(f.getName(), exec) and
+    exists(string subMessage | preferredRaise(f.getName(), _, subMessage) |
+      if alwaysRaises(f, exec)
+      then message = "This method always raises $@ - " + subMessage
+      else message = "This method raises $@ - " + subMessage
     )
   )
-select f, "Function always raises $@; " + message, cls, cls.toString()
+select f, message, exec, getExecName(exec)
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py
deleted file mode 100644
index 405400bfe614..000000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod2.py
+++ /dev/null
@@ -1,15 +0,0 @@
-    
-#Abstract base class, but don't declare it.
-class ImplicitAbstractClass(object):
-    
-    def __add__(self, other):
-        raise NotImplementedError()
-    
-#Make abstractness explicit.
-class ExplicitAbstractClass:
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def __add__(self, other):
-        raise NotImplementedError()
- 
diff --git a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py b/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py
deleted file mode 100644
index 048d5043b4dc..000000000000
--- a/python/ql/src/Functions/IncorrectRaiseInSpecialMethod3.py
+++ /dev/null
@@ -1,27 +0,0 @@
-    
-#Incorrect file-backed table
-class FileBackedTable(object):
-    
-    def __getitem__(self, key):
-        if key not in self.index:
-            raise IOError("Key '%s' not in table" % key)
-        else:
-            #May raise an IOError
-            return self.backing.get_row(key)
-        
-#Correct by transforming exception
-class ObjectLikeFileBackedTable(object):
-    
-    def get_from_key(self, key):
-        if key not in self.index:
-            raise IOError("Key '%s' not in table" % key)
-        else:
-            #May raise an IOError
-            return self.backing.get_row(key)
-    
-    def __getitem__(self, key):
-        try:
-            return self.get_from_key(key)
-        except IOError:
-            raise KeyError(key)
-                           
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py
new file mode 100644
index 000000000000..d565a86cab27
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod.py
@@ -0,0 +1,22 @@
+class A:
+    def __init__(self, a):
+        self.a = a 
+
+    def __add__(self, other):
+        # BAD: Should return NotImplemented instead of raising
+        if not isinstance(other,A):
+            raise TypeError(f"Cannot add A to {other.__class__}")
+        return A(self.a + other.a)
+
+class B:
+    def __init__(self, a):
+        self.a = a 
+
+    def __add__(self, other):
+        # GOOD: Returning NotImplemented allows for the operation to fallback to other implementations to allow other classes to support adding to B.
+        if not isinstance(other,B):
+            return NotImplemented
+        return B(self.a + other.a)
+    
+
+        
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py
new file mode 100644
index 000000000000..ba5f90f46708
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod2.py
@@ -0,0 +1,7 @@
+class C:
+    def __getitem__(self, idx):
+        if self.idx < 0:
+            # BAD: Should raise a KeyError or IndexError instead.
+            raise ValueError("Invalid index")
+        return self.lookup(idx)
+ 
diff --git a/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py
new file mode 100644
index 000000000000..33541adc7e64
--- /dev/null
+++ b/python/ql/src/Functions/examples/IncorrectRaiseInSpecialMethod3.py
@@ -0,0 +1,4 @@
+class D:
+    def __hash__(self):
+        # BAD: Use `__hash__ = None` instead.
+        raise NotImplementedError(f"{self.__class__} is unhashable.")
\ No newline at end of file
diff --git a/python/ql/src/change-notes/released/1.6.4.md b/python/ql/src/change-notes/released/1.6.4.md
new file mode 100644
index 000000000000..e2f0bb39930e
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.6.4.md
@@ -0,0 +1,7 @@
+## 1.6.4
+
+### Minor Analysis Improvements
+
+* The `py/unexpected-raise-in-special-method` query has been modernized. It produces additional results in cases where the exception is 
+only raised conditionally. Its precision has been changed from `very-high` to `high`.
+* The queries `py/incomplete-ordering`, `py/inconsistent-equality`, and `py/equals-hash-mismatch` have been modernized; no longer relying on outdated libraries, improved documentation, and no longer producing alerts for problems specific to Python 2.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 00b51441d882..1910e09d6a6a 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.3
+lastReleaseVersion: 1.6.4
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 121332a724ba..458b5f3eb8f2 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.6.3
+version: 1.6.4
 groups:
   - python
   - queries
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected
deleted file mode 100644
index 916a9bb4454b..000000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not define __hash__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
-| equals_hash.py:24:5:24:23 | Function Hash.__hash__ | Class $@ implements __hash__ but does not define __eq__ or __cmp__. | equals_hash.py:19:1:19:19 | class Hash | Hash |
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref
deleted file mode 100644
index 7eb0f07e51cc..000000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrHash.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrHash.ql
\ No newline at end of file
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected
deleted file mode 100644
index 04e395c668bb..000000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-| equals_hash.py:8:5:8:28 | Function Eq.__eq__ | Class $@ implements __eq__ but does not implement __ne__. | equals_hash.py:3:1:3:17 | class Eq | Eq |
-| equals_hash.py:16:5:16:28 | Function Ne.__ne__ | Class $@ implements __ne__ but does not implement __eq__. | equals_hash.py:11:1:11:17 | class Ne | Ne |
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref b/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref
deleted file mode 100644
index 163a9f3b6675..000000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/EqualsOrNotEquals.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrNotEquals.ql
\ No newline at end of file
diff --git a/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py b/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py
deleted file mode 100644
index 447250a5375c..000000000000
--- a/python/ql/test/2/query-tests/Classes/equals-hash/equals_hash.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#Equals and hash
-
-class Eq(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __eq__(self, other):
-        return self.data == other.data
-
-class Ne(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __ne__(self, other):
-        return self.data != other.data
-
-class Hash(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __hash__(self):
-        return hash(self.data)
-    
-class Unhashable1(object):
-    
-    __hash__ = None
-    
-
-class EqOK1(Unhashable1):
-    
-    def __eq__(self, other):
-        return False
-    
-    def __ne__(self, other):
-        return True
-    
-class Unhashable2(object):
-    
-    #Not the idiomatic way of doing it, but not uncommon either
-    def __hash__(self):
-        raise TypeError("unhashable object")
-
-
-class EqOK2(Unhashable2):
-
-    def __eq__(self, other):
-        return False
-
-    def __ne__(self, other):
-        return True
-
-class ReflectiveNotEquals(object):
-
-    def __ne__(self, other):
-        return not self == other
-
-class EqOK3(ReflectiveNotEquals, Unhashable1):
-
-    def __eq__(self, other):
-        return self.data == other.data
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected
deleted file mode 100644
index 87cf5d1e4645..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.expected
+++ /dev/null
@@ -1 +0,0 @@
-| equals_hash.py:24:5:24:23 | Function Hash.__hash__ | Class $@ implements __hash__ but does not define __eq__. | equals_hash.py:19:1:19:19 | class Hash | Hash |
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref
deleted file mode 100644
index 7eb0f07e51cc..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/EqualsOrHash.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrHash.ql
\ No newline at end of file
diff --git a/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py b/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py
deleted file mode 100644
index d5a58d0b78c2..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-hash/equals_hash.py
+++ /dev/null
@@ -1,63 +0,0 @@
-#Equals and hash
-
-class Eq(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __eq__(self, other):
-        return self.data == other.data
-
-class Ne(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __ne__(self, other):
-        return self.data != other.data
-
-class Hash(object):
-
-    def __init__(self, data):
-        self.data = data
-
-    def __hash__(self):
-        return hash(self.data)
-    
-class Unhashable1(object):
-    
-    __hash__ = None
-    
-
-class EqOK1(Unhashable1):
-    
-    def __eq__(self, other):
-        return False
-    
-    def __ne__(self, other):
-        return True
-    
-class Unhashable2(object):
-
-    #Not the idiomatic way of doing it, but not uncommon either
-    def __hash__(self):
-        raise TypeError("unhashable object")
-
-
-class EqOK2(Unhashable2):
-
-    def __eq__(self, other):
-        return False
-
-    def __ne__(self, other):
-        return True
-
-class ReflectiveNotEquals(object):
-
-    def __ne__(self, other):
-        return not self == other
-
-class EqOK3(ReflectiveNotEquals, Unhashable1):
-
-    def __eq__(self, other):
-        return self.data == other.data
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected b/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected
deleted file mode 100644
index 7e9c94581207..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.expected
+++ /dev/null
@@ -1 +0,0 @@
-| test.py:9:5:9:28 | Function NotOK2.__ne__ | Class $@ implements __ne__ but does not implement __eq__. | test.py:7:1:7:13 | class NotOK2 | NotOK2 |
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref b/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref
deleted file mode 100644
index 163a9f3b6675..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/EqualsOrNotEquals.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/EqualsOrNotEquals.ql
\ No newline at end of file
diff --git a/python/ql/test/3/query-tests/Classes/equals-ne/test.py b/python/ql/test/3/query-tests/Classes/equals-ne/test.py
deleted file mode 100644
index 15097820bf46..000000000000
--- a/python/ql/test/3/query-tests/Classes/equals-ne/test.py
+++ /dev/null
@@ -1,10 +0,0 @@
-
-class OK:
-
-    def __eq__(self, other):
-        return False
-
-class NotOK2:
-
-    def __ne__(self, other):
-        return True
diff --git a/python/ql/test/library-tests/frameworks/lxml/parsing.py b/python/ql/test/library-tests/frameworks/lxml/parsing.py
index 63cdc79b4c1d..bff508f24ab0 100644
--- a/python/ql/test/library-tests/frameworks/lxml/parsing.py
+++ b/python/ql/test/library-tests/frameworks/lxml/parsing.py
@@ -50,7 +50,7 @@
 
 # Billion laughs vuln (also XXE)
 parser = lxml.etree.XMLParser(huge_tree=True)
-lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVuln='XML bomb' xmlVuln='XXE' decodeOutput=lxml.etree.fromstring(..)
+lxml.etree.fromstring(x, parser=parser) # $ decodeFormat=XML decodeInput=x xmlVuln='XXE' decodeOutput=lxml.etree.fromstring(..)
 
 # Safe for both Billion laughs and XXE
 parser = lxml.etree.XMLParser(resolve_entities=False, huge_tree=True)
@@ -63,5 +63,5 @@
 # iterparse configurations ... this doesn't use a parser argument but takes MOST (!) of
 # the normal XMLParser arguments. Specifically, it doesn't allow disabling XXE :O
 
-lxml.etree.iterparse(xml_file, huge_tree=True) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='XML bomb' xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
+lxml.etree.iterparse(xml_file, huge_tree=True) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
 lxml.etree.iterparse(xml_file, load_dtd=True, no_network=False) # $ decodeFormat=XML decodeInput=xml_file xmlVuln='DTD retrieval' xmlVuln='XXE' decodeOutput=lxml.etree.iterparse(..) getAPathArgument=xml_file
diff --git a/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.expected b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.expected
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql
new file mode 100644
index 000000000000..b557a0bccb69
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/psycopg2/ConceptsTest.ql
@@ -0,0 +1,2 @@
+import python
+import experimental.meta.ConceptsTest
diff --git a/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py b/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py
new file mode 100644
index 000000000000..507cdd59b822
--- /dev/null
+++ b/python/ql/test/library-tests/frameworks/psycopg2/connectionpool.py
@@ -0,0 +1,46 @@
+# Examples using psycopg2 connection pools.
+
+import psycopg2
+from psycopg2.pool import SimpleConnectionPool, AbstractConnectionPool
+
+
+DSN = "dbname=test user=test password=test host=localhost port=5432"
+
+
+def run_simple_pool_query():
+    pool = SimpleConnectionPool(1, 4, dsn=DSN)
+    try:
+        conn = pool.getconn()
+        try:
+            cur = conn.cursor()
+            try:
+                # Simple, parameterless query
+                cur.execute("SELECT 1") # $ getSql="SELECT 1"
+                _ = cur.fetchall() if hasattr(cur, "fetchall") else None # $ threatModelSource[database]=cur.fetchall()
+            finally:
+                cur.close()
+        finally:
+            pool.putconn(conn)
+    finally:
+        pool.closeall()
+
+
+class LocalPool(AbstractConnectionPool):
+    pass
+
+
+def run_custom_pool_query():
+    pool = LocalPool(1, 3, dsn=DSN)
+    try:
+        conn = pool.getconn()
+        try:
+            cur = conn.cursor()
+            try:
+                cur.execute("SELECT 2") # $ getSql="SELECT 2"
+                _ = cur.fetchone() if hasattr(cur, "fetchone") else None # $ threatModelSource[database]=cur.fetchone()
+            finally:
+                cur.close()
+        finally:
+            pool.putconn(conn)
+    finally:
+        pool.closeall()
diff --git a/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected b/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
index e69de29bb2d1..2f5a5a249f5f 100644
--- a/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
+++ b/python/ql/test/query-tests/Classes/equals-attr/DefineEqualsWhenAddingAttributes.expected
@@ -0,0 +1 @@
+| attr_eq_test.py:21:1:21:27 | class BadColorPoint | The class 'BadColorPoint' does not override $@, but adds the new attribute $@. | attr_eq_test.py:10:5:10:28 | Function Point.__eq__ | '__eq__' | attr_eq_test.py:25:9:25:19 | Attribute | _color |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/attr_eq_test.py b/python/ql/test/query-tests/Classes/equals-attr/attr_eq_test.py
similarity index 100%
rename from python/ql/test/query-tests/Classes/equals-hash/attr_eq_test.py
rename to python/ql/test/query-tests/Classes/equals-attr/attr_eq_test.py
diff --git a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected b/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected
deleted file mode 100644
index 2f5a5a249f5f..000000000000
--- a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.expected
+++ /dev/null
@@ -1 +0,0 @@
-| attr_eq_test.py:21:1:21:27 | class BadColorPoint | The class 'BadColorPoint' does not override $@, but adds the new attribute $@. | attr_eq_test.py:10:5:10:28 | Function Point.__eq__ | '__eq__' | attr_eq_test.py:25:9:25:19 | Attribute | _color |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref b/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref
deleted file mode 100644
index e542a6176ad4..000000000000
--- a/python/ql/test/query-tests/Classes/equals-hash/DefineEqualsWhenAddingFields.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Classes/DefineEqualsWhenAddingAttributes.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected
new file mode 100644
index 000000000000..bd584939b43d
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.expected
@@ -0,0 +1,2 @@
+| equalsHash.py:13:1:13:8 | Class C | This class implements $@, but does not implement __eq__. | equalsHash.py:14:5:14:23 | Function __hash__ | __hash__ |
+| equalsHash.py:17:1:17:11 | Class D | This class implements $@, but does not implement __eq__. | equalsHash.py:18:5:18:23 | Function __hash__ | __hash__ |
diff --git a/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref
new file mode 100644
index 000000000000..e531bbc62e32
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/EqualsOrHash.qlref
@@ -0,0 +1,2 @@
+query: Classes/Comparisons/EqualsOrHash.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py b/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py
new file mode 100644
index 000000000000..c9e1e47350f8
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-hash/equalsHash.py
@@ -0,0 +1,19 @@
+class A:
+    def __eq__(self, other):
+        return True 
+    
+    def __hash__(self):
+        return 7 
+    
+# B is automatically non-hashable - so eq without hash never needs to alert
+class B:
+    def __eq__(self, other):
+        return True 
+    
+class C: # $ Alert
+    def __hash__(self):
+        return 5
+    
+class D(A): # $ Alert 
+    def __hash__(self):
+        return 4
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected
new file mode 100644
index 000000000000..ceec3c1cef98
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.expected
@@ -0,0 +1,2 @@
+| EqualsOrNotEquals.py:14:1:14:8 | Class B | This class implements $@, but does not implement __eq__. | EqualsOrNotEquals.py:19:5:19:28 | Function __ne__ | __ne__ |
+| EqualsOrNotEquals.py:37:1:37:11 | Class D | This class implements $@, but does not implement __ne__. | EqualsOrNotEquals.py:43:5:43:28 | Function __eq__ | __eq__ |
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py
new file mode 100644
index 000000000000..2052118e749a
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.py
@@ -0,0 +1,147 @@
+class A:
+    def __init__(self, a):
+        self.a = a
+
+    # OK: __ne__ if not defined delegates to eq automatically
+    def __eq__(self, other):
+        return self.a == other.a 
+
+assert (A(1) == A(1))
+assert not (A(1) == A(2))
+assert not (A(1) != A(1))
+assert (A(1) != A(2))
+
+class B: # $ Alert 
+    def __init__(self, b):
+        self.b = b
+
+    # BAD: eq defaults to `is`
+    def __ne__(self, other):
+        return self.b != other.b 
+
+assert not (B(1) == B(1)) # potentially unexpected
+assert not (B(2) == B(2))
+assert not (B(1) != B(1))
+assert (B(1) != B(2))
+
+class C:
+    def __init__(self, c):
+        self.c = c 
+
+    def __eq__(self, other):
+        return self.c == other.c 
+
+    def __ne__(self, other):
+        return self.c != other.c 
+
+class D(C): # $ Alert 
+    def __init__(self, c, d):
+        super().__init__(c)
+        self.d = d
+
+    # BAD: ne is not defined, but the superclass ne is used instead of delegating, which may be incorrect
+    def __eq__(self, other):
+        return self.c == other.c and self.d == other.d
+
+assert (D(1,2) == D(1,2))
+assert not (D(1,2) == D(1,3))
+assert (D(1,2) != D(3,2)) 
+assert not (D(1,2) != D(1,3)) # Potentially unexpected 
+
+class E:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+class F(E): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F(1,2) == F(1,2))
+assert not (F(1,2) == F(1,3))
+assert (F(1,2) != F(3,2)) 
+assert (F(1,2) != F(1,3))
+
+# Variations 
+
+class E2:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not self == other
+
+class F2(E2): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F2(1,2) == F2(1,2))
+assert not (F2(1,2) == F2(1,3))
+assert (F2(1,2) != F2(3,2)) 
+assert (F2(1,2) != F2(1,3))
+
+class E3:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not other.__eq__(self)
+
+class F3(E3): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F3(1,2) == F3(1,2))
+assert not (F3(1,2) == F3(1,3))
+assert (F3(1,2) != F3(3,2)) 
+assert (F3(1,2) != F3(1,3))
+
+class E4:
+    def __init__(self, e):
+        self.e = e 
+
+    def __eq__(self, other):
+        return self.e == other.e 
+
+    def __ne__(self, other):
+        return not other == self
+
+class F4(E4): 
+    def __init__(self, e, f):
+        super().__init__(e)
+        self.f = f
+
+    # OK: superclass ne delegates to eq
+    def __eq__(self, other):
+        return self.e == other.e and self.f == other.f
+
+assert (F4(1,2) == F4(1,2))
+assert not (F4(1,2) == F4(1,3))
+assert (F4(1,2) != F4(3,2)) 
+assert (F4(1,2) != F4(1,3))
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref
new file mode 100644
index 000000000000..9b1e8646c0e3
--- /dev/null
+++ b/python/ql/test/query-tests/Classes/equals-not-equals/EqualsOrNotEquals.qlref
@@ -0,0 +1,2 @@
+query: Classes/Comparisons/EqualsOrNotEquals.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
index d376a0023353..94df0ad1d326 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.expected
@@ -1 +1,2 @@
-| incomplete_ordering.py:3:1:3:26 | class PartOrdered | Class PartOrdered implements $@, but does not implement __le__ or __gt__ or __ge__. | incomplete_ordering.py:13:5:13:28 | Function PartOrdered.__lt__ | __lt__ |
+| incomplete_ordering.py:3:1:3:26 | Class LtWithoutLe | This class implements $@, but does not implement __le__ or __ge__. | incomplete_ordering.py:13:5:13:28 | Function __lt__ | __lt__ |
+| incomplete_ordering.py:28:1:28:17 | Class LendGeNoLt | This class implements $@, but does not implement __lt__ or __gt__. | incomplete_ordering.py:29:5:29:28 | Function __le__ | __le__ |
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
index 3387dad807a7..cb15c6a47ba5 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/IncompleteOrdering.qlref
@@ -1 +1,2 @@
-Classes/IncompleteOrdering.ql
\ No newline at end of file
+query: Classes/Comparisons/IncompleteOrdering.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py b/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
index 3c7514d7a838..2645819c43b1 100644
--- a/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
+++ b/python/ql/test/query-tests/Classes/incomplete-ordering/incomplete_ordering.py
@@ -1,6 +1,6 @@
 #Incomplete ordering
 
-class PartOrdered(object):
+class LtWithoutLe(object): # $ Alert
     def __eq__(self, other):
         return self is other
 
@@ -13,6 +13,28 @@ def __hash__(self):
     def __lt__(self, other):
         return False
 
-#Don't blame a sub-class for super-class's sins.
-class DerivedPartOrdered(PartOrdered):
-    pass
\ No newline at end of file
+# Don't alert on subclass
+class LtWithoutLeSub(LtWithoutLe):
+    pass
+
+class LeSub(LtWithoutLe):
+    def __le__(self, other):
+        return self < other or self == other 
+    
+class GeSub(LtWithoutLe):
+    def __ge__(self, other):
+        return self > other or self == other 
+    
+class LendGeNoLt: # $ Alert
+    def __le__(self, other):
+        return True 
+    
+    def __ge__(self, other):
+        return other <= self 
+    
+from functools import total_ordering
+
+@total_ordering
+class Total:
+    def __le__(self, other):
+        return True
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
index caad71a9a31f..94912eb1f914 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.expected
@@ -1 +1,2 @@
-| subclass_shadowing.py:10:5:10:21 | FunctionExpr | Method shadow is shadowed by an $@ in super class 'Base'. | subclass_shadowing.py:6:9:6:23 | AssignStmt | attribute |
+| subclass_shadowing.py:11:5:11:21 | Function shadow | This method is shadowed by $@ in superclass $@. | subclass_shadowing.py:7:9:7:19 | ControlFlowNode for Attribute | attribute shadow | subclass_shadowing.py:4:1:4:11 | Class Base | Base |
+| subclass_shadowing.py:41:5:41:18 | Function foo | This method is shadowed by $@ in superclass $@. (read-only property may cause an error if written to in the superclass) | subclass_shadowing.py:35:9:35:16 | ControlFlowNode for Attribute | attribute foo | subclass_shadowing.py:33:1:33:12 | Class Base3 | Base3 |
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
index 5fed3f9f8fc6..5205014a3d55 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/SubclassShadowing.qlref
@@ -1 +1,2 @@
-Classes/SubclassShadowing.ql
+query: Classes/SubclassShadowing/SubclassShadowing.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py b/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
index 98e7f992e84e..b9fcd975eb33 100644
--- a/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
+++ b/python/ql/test/query-tests/Classes/subclass-shadowing/subclass_shadowing.py
@@ -1,30 +1,51 @@
 #Subclass shadowing
 
-class Base(object):
+# BAD: `shadow` method shadows attribute
+class Base:
 
     def __init__(self):
         self.shadow = 4
 
 class Derived(Base):
 
-    def shadow(self):
+    def shadow(self): # $ Alert 
         pass
     
     
-#OK if the super class defines the method as well.
-#Since the original method must exist for some reason.
-#See JSONEncoder.default for real example
+# OK: Allow if superclass also shadows its own method, as this is likely intended.
+# Example: stdlib JSONEncoder.default uses this pattern.  
+class Base2:
 
-class Base2(object):
+    def __init__(self, default=None):
+        if default:
+            self.default = default
 
-    def __init__(self, shadowy=None):
-        if shadowy:
-            self.shadow = shadowy
-
-    def shadow(self):
+    def default(self):
         pass
 
 class Derived2(Base2):
 
-    def shadow(self):
+    def default(self): # No alert
         return 0
+
+# Properties 
+
+class Base3:
+    def __init__(self):
+        self.foo = 1 
+        self.bar = 2 
+
+class Derived3(Base3):
+    # BAD: Write to foo in superclass init raises an error.
+    @property 
+    def foo(self): # $ Alert
+        return 2 
+    
+    # OK: This property has a setter, so the write is OK.
+    @property 
+    def bar(self): # No alert
+        return self._bar 
+    
+    @bar.setter 
+    def bar(self, val):
+        self._bar = val
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected
new file mode 100644
index 000000000000..3907a725ee18
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.expected
@@ -0,0 +1,6 @@
+| test.py:6:5:6:33 | Function __getitem__ | This method always raises $@ - should raise a LookupError (KeyError or IndexError) instead. | test.py:7:15:7:33 | ZeroDivisionError() | ZeroDivisionError |
+| test.py:9:5:9:32 | Function __getattr__ | This method always raises $@ - should raise an AttributeError instead. | test.py:10:15:10:33 | ZeroDivisionError() | ZeroDivisionError |
+| test.py:12:5:12:23 | Function __bool__ | This method always raises $@ - should raise a TypeError instead. | test.py:13:15:13:26 | ValueError() | ValueError |
+| test.py:15:5:15:22 | Function __int__ | This method always raises $@ - this method does not need to be implemented. | test.py:16:15:16:26 | ValueError() | ValueError |
+| test.py:24:5:24:23 | Function __hash__ | This method always raises $@ - use __hash__ = None instead. | test.py:25:15:25:35 | NotImplementedError() | NotImplementedError |
+| test.py:28:5:28:29 | Function __sub__ | This method raises $@ - should raise an ArithmeticError or return NotImplemented instead. | test.py:30:19:30:29 | TypeError() | TypeError |
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref
new file mode 100644
index 000000000000..a81e499ea66b
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/IncorrectRaiseInSpecialMethod.qlref
@@ -0,0 +1,2 @@
+query: Functions/IncorrectRaiseInSpecialMethod.ql
+postprocess: utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py
new file mode 100644
index 000000000000..d5b1bc585f62
--- /dev/null
+++ b/python/ql/test/query-tests/Functions/IncorrectRaiseInSpecialMethod/test.py
@@ -0,0 +1,66 @@
+class A:
+
+    def __add__(self, other): # No alert - Always allow NotImplementedError
+        raise NotImplementedError() 
+
+    def __getitem__(self, index): # $ Alert
+        raise ZeroDivisionError() 
+
+    def __getattr__(self, name): # $ Alert
+        raise ZeroDivisionError() 
+
+    def __bool__(self): # $ Alert
+        raise ValueError() 
+    
+    def __int__(self): # $ Alert # Cast method need not be defined to always raise
+        raise ValueError() 
+
+    def __float__(self): # No alert - OK to raise conditionally
+        if self.z:
+            return 0 
+        else:
+            raise ValueError()
+
+    def __hash__(self): # $ Alert # should use __hash__=None rather than stub implementation to make class unhashable
+        raise NotImplementedError()
+
+class B:
+    def __sub__(self, other): # $ Alert # should return NotImplemented instead
+        if not isinstance(other,B):
+            raise TypeError()
+        return self
+        
+    def __add__(self, other): # No alert - allow add to raise a TypeError, as it is sometimes used for sequence concatenation as well as arithmetic 
+        if not isinstance(other,B):
+            raise TypeError()
+        return self
+
+    def __setitem__(self, key, val): # No alert - allow setitem to raise arbitrary exceptions as they could be due to the value, rather than a LookupError relating to the key
+        if val < 0:
+            raise ValueError()
+
+    def __getitem__(self, key): # No alert - indexing method allowed to raise TypeError or subclasses of LookupError. 
+        if not isinstance(key, int):
+            raise TypeError()
+        if key < 0:
+            raise KeyError()
+        return 3
+
+    def __getattribute__(self, name):
+        if name != "a":
+            raise AttributeError() 
+        return 2
+
+    def __div__(self, other):
+        if other == 0:
+            raise ZeroDivisionError()
+        return self 
+
+    
+class D:
+    def __int__(self):
+        return 2 
+
+class E(D):
+    def __int__(self): # No alert - cast method may override to raise exception
+        raise TypeError()
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected b/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected
deleted file mode 100644
index dd4429de02e9..000000000000
--- a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-| protocols.py:98:5:98:33 | Function __getitem__ | Function always raises $@; raise LookupError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
-| protocols.py:101:5:101:26 | Function __getattr__ | Function always raises $@; raise AttributeError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
-| protocols.py:104:5:104:23 | Function __bool__ | Function always raises $@; raise TypeError instead | file://:Compiled Code:0:0:0:0 | builtin-class ZeroDivisionError | builtin-class ZeroDivisionError |
diff --git a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref b/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref
deleted file mode 100644
index 07fd22a93767..000000000000
--- a/python/ql/test/query-tests/Functions/general/IncorrectRaiseInSpecialMethod.qlref
+++ /dev/null
@@ -1 +0,0 @@
-Functions/IncorrectRaiseInSpecialMethod.ql
\ No newline at end of file
diff --git a/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected b/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
index 8a7d7bc75e3d..e217064d1dfc 100644
--- a/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
+++ b/python/ql/test/query-tests/Security/CWE-776-XmlBomb/XmlBomb.expected
@@ -1,14 +1,4 @@
 edges
-| test.py:1:26:1:32 | ControlFlowNode for ImportMember | test.py:1:26:1:32 | ControlFlowNode for request | provenance |  |
-| test.py:1:26:1:32 | ControlFlowNode for request | test.py:19:19:19:25 | ControlFlowNode for request | provenance |  |
-| test.py:19:5:19:15 | ControlFlowNode for xml_content | test.py:30:34:30:44 | ControlFlowNode for xml_content | provenance |  |
-| test.py:19:19:19:25 | ControlFlowNode for request | test.py:19:5:19:15 | ControlFlowNode for xml_content | provenance | AdditionalTaintStep |
 nodes
-| test.py:1:26:1:32 | ControlFlowNode for ImportMember | semmle.label | ControlFlowNode for ImportMember |
-| test.py:1:26:1:32 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
-| test.py:19:5:19:15 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
-| test.py:19:19:19:25 | ControlFlowNode for request | semmle.label | ControlFlowNode for request |
-| test.py:30:34:30:44 | ControlFlowNode for xml_content | semmle.label | ControlFlowNode for xml_content |
 subpaths
 #select
-| test.py:30:34:30:44 | ControlFlowNode for xml_content | test.py:1:26:1:32 | ControlFlowNode for ImportMember | test.py:30:34:30:44 | ControlFlowNode for xml_content | XML parsing depends on a $@ without guarding against uncontrolled entity expansion. | test.py:1:26:1:32 | ControlFlowNode for ImportMember | user-provided value |
diff --git a/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected b/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
index 1162bce43fa0..5c7c31ea4b2b 100644
--- a/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
+++ b/python/ql/test/query-tests/analysis/jump_to_defn/Definitions.expected
@@ -26,3 +26,6 @@
 | test.py:44:8:44:14 | ImportExpr | package/__init__.py:0:0:0:0 | Definition package/__init__.py:0 | Definition |
 | test.py:45:1:45:1 | p | test.py:44:8:44:14 | Definition test.py:44 | Definition |
 | test.py:45:3:45:3 | Attribute | package/__init__.py:2:18:2:18 | Definition package/__init__.py:2 | Definition |
+| test.py:48:32:48:38 | dirname | test.py:47:9:47:15 | Definition test.py:47 | Definition |
+| test.py:50:34:50:38 | lines | test.py:47:18:47:22 | Definition test.py:47 | Definition |
+| test.py:53:12:53:12 | x | test.py:49:9:49:12 | Definition test.py:49 | Definition |
diff --git a/python/ql/test/query-tests/analysis/jump_to_defn/test.py b/python/ql/test/query-tests/analysis/jump_to_defn/test.py
index 0abfeb32c401..b9be08a48676 100644
--- a/python/ql/test/query-tests/analysis/jump_to_defn/test.py
+++ b/python/ql/test/query-tests/analysis/jump_to_defn/test.py
@@ -43,3 +43,11 @@ class Decorated(object):
 from package import x
 import package as p
 p.x
+
+def foo(dirname, lines):
+    head, tail = os.path.split(dirname)
+    x = head # `head` is missing jump-to-def target
+    for start, line in enumerate(lines):
+        line = line.strip() # `line` is missing jump-to-def target
+        break
+    return x
\ No newline at end of file
diff --git a/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll b/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
index 9549bb85844b..4805cf5d69f5 100644
--- a/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
+++ b/ql/ql/src/codeql_ql/style/RedundantCastQuery.qll
@@ -1,11 +1,12 @@
 import ql
 
 class RedundantInlineCast extends AstNode instanceof InlineCast {
-  Type t;
-
   RedundantInlineCast() {
-    t = unique( | | super.getType()) and
-    (
+    exists(Type t |
+      t = unique( | | super.getType()) and
+      // noopt can require explicit casts
+      not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
+    |
       // The cast is to the type the base expression already has
       t = unique( | | super.getBase().getType())
       or
@@ -23,9 +24,7 @@ class RedundantInlineCast extends AstNode instanceof InlineCast {
         target = unique( | | call.getTarget()) and
         t = unique( | | target.getParameterType(i))
       )
-    ) and
-    // noopt can require explicit casts
-    not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
+    )
   }
 
   TypeExpr getTypeExpr() { result = super.getTypeExpr() }
@@ -49,15 +48,16 @@ private class AnyCast extends AstNode instanceof FullAggregate {
 // `foo = any(Bar b)` is effectively a cast to `Bar`.
 class RedundantAnyCast extends AstNode instanceof ComparisonFormula {
   AnyCast cast;
-  Expr operand;
 
   RedundantAnyCast() {
     super.getOperator() = "=" and
     super.getAnOperand() = cast and
-    super.getAnOperand() = operand and
-    cast != operand and
-    unique( | | operand.getType()).getASuperType*() =
-      unique( | | cast.getTypeExpr().getResolvedType()) and
+    exists(Expr operand |
+      super.getAnOperand() = operand and
+      cast != operand and
+      unique( | | operand.getType()).getASuperType*() =
+        unique( | | cast.getTypeExpr().getResolvedType())
+    ) and
     not this.getEnclosingPredicate().getAnAnnotation() instanceof NoOpt
   }
 
diff --git a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
index 520acbaa1b3a..10e97e582096 100644
--- a/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
+++ b/ql/ql/test/queries/performance/VarUnusedInDisjunct/Test.qll
@@ -165,4 +165,6 @@ class HasField extends Big {
     or
     this.toString().matches("%foo") // <- field only defined here.
   }
+
+  Big getField() { result = field }
 }
diff --git a/ql/ql/test/queries/style/Misspelling/Misspelling.expected b/ql/ql/test/queries/style/Misspelling/Misspelling.expected
index 8116e2b5afa7..1c02ca81d621 100644
--- a/ql/ql/test/queries/style/Misspelling/Misspelling.expected
+++ b/ql/ql/test/queries/style/Misspelling/Misspelling.expected
@@ -2,5 +2,5 @@
 | Test.qll:4:7:4:26 | Class PublicallyAccessible | This class name contains the common misspelling 'publically', which should instead be 'publicly'. |
 | Test.qll:5:3:5:20 | FieldDecl | This field name contains the common misspelling 'occurences', which should instead be 'occurrences'. |
 | Test.qll:10:13:10:23 | ClassPredicate hasAgrument | This predicate name contains the common misspelling 'agrument', which should instead be 'argument'. |
-| Test.qll:13:1:16:3 | QLDoc | This comment contains the non-US spelling 'colour', which should instead be 'color'. |
-| Test.qll:17:7:17:17 | Class AnalysedInt | This class name contains the non-US spelling 'analysed', which should instead be 'analyzed'. |
+| Test.qll:15:1:18:3 | QLDoc | This comment contains the non-US spelling 'colour', which should instead be 'color'. |
+| Test.qll:19:7:19:17 | Class AnalysedInt | This class name contains the non-US spelling 'analysed', which should instead be 'analyzed'. |
diff --git a/ql/ql/test/queries/style/Misspelling/Test.qll b/ql/ql/test/queries/style/Misspelling/Test.qll
index f49f4633c6b8..b6619145f8d5 100644
--- a/ql/ql/test/queries/style/Misspelling/Test.qll
+++ b/ql/ql/test/queries/style/Misspelling/Test.qll
@@ -8,6 +8,8 @@ class PublicallyAccessible extends string {
 
   // should be argument
   predicate hasAgrument() { none() }
+
+  int getNum() { result = numOccurences }
 }
 
 /**
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
index 3429ce5b5994..b58cb3f93e37 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/Foo.qll
@@ -22,6 +22,8 @@ class Inst3 extends string {
   Range range;
 
   Inst3() { this = range }
+
+  Range getRange() { result = range }
 }
 
 class Inst4 extends string {
diff --git a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
index 72f110c632f9..804927fa0327 100644
--- a/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
+++ b/ql/ql/test/queries/style/UseInstanceofExtension/UseInstanceofExtension.expected
@@ -1,4 +1,4 @@
 | Foo.qll:7:7:7:10 | Class Inst | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
 | Foo.qll:15:7:15:11 | Class Inst2 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
 | Foo.qll:21:7:21:11 | Class Inst3 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
-| Foo.qll:27:7:27:11 | Class Inst4 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
+| Foo.qll:29:7:29:11 | Class Inst4 | Consider defining this class as non-extending subtype of $@. | Foo.qll:1:7:1:11 | Class Range | Range |
diff --git a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
index fac79ff078ed..ed17f5e1f1a7 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
+++ b/ql/ql/test/queries/style/UseSetLiteral/UseSetLiteral.expected
@@ -4,5 +4,5 @@
 | test.qll:62:7:65:14 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
 | test.qll:68:7:71:13 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
 | test.qll:74:7:77:13 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
-| test.qll:87:3:90:9 | Disjunction | This formula of 4 predicate calls can be replaced with a single call on a set literal, improving readability. |
-| test.qll:128:3:134:3 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
+| test.qll:89:3:92:9 | Disjunction | This formula of 4 predicate calls can be replaced with a single call on a set literal, improving readability. |
+| test.qll:130:3:136:3 | Disjunction | This formula of 4 comparisons can be replaced with a single equality on a set literal, improving readability. |
diff --git a/ql/ql/test/queries/style/UseSetLiteral/test.qll b/ql/ql/test/queries/style/UseSetLiteral/test.qll
index 36a5f938f895..fcc581c3e8cd 100644
--- a/ql/ql/test/queries/style/UseSetLiteral/test.qll
+++ b/ql/ql/test/queries/style/UseSetLiteral/test.qll
@@ -81,6 +81,8 @@ class MyTest8Class extends int {
   predicate is(int x) { x = this }
 
   int get() { result = this }
+
+  string getS() { result = s }
 }
 
 predicate test9(MyTest8Class c) {
diff --git a/ruby/codeql-extractor.yml b/ruby/codeql-extractor.yml
index b1eee384133b..dc885ecc37be 100644
--- a/ruby/codeql-extractor.yml
+++ b/ruby/codeql-extractor.yml
@@ -6,6 +6,8 @@ legacy_qltest_extraction: true
 overlay_support_version: 20250626
 build_modes:
   - none
+default_queries:
+  - codeql/ruby-queries
 github_api_languages:
   - Ruby
 scc_languages:
diff --git a/ruby/extractor/Cargo.toml b/ruby/extractor/Cargo.toml
index 16cdcca246c2..63c6d16d53ca 100644
--- a/ruby/extractor/Cargo.toml
+++ b/ruby/extractor/Cargo.toml
@@ -17,6 +17,6 @@ rayon = "1.10.0"
 regex = "1.11.1"
 encoding = "0.2"
 lazy_static = "1.5.0"
-serde_json = "1.0.140"
+serde_json = "1.0.142"
 
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index 24c2c0b6a4a1..560bf17bc51c 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.3
+
+No user-facing changes.
+
 ## 5.0.2
 
 ### Bug Fixes
diff --git a/ruby/ql/lib/change-notes/released/5.0.3.md b/ruby/ql/lib/change-notes/released/5.0.3.md
new file mode 100644
index 000000000000..57074925279e
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.0.3.md
@@ -0,0 +1,3 @@
+## 5.0.3
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 3940dee0f32d..6997554f6ddd 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.0.2
+lastReleaseVersion: 5.0.3
diff --git a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
index 00537e375b1b..a74b0e081995 100644
--- a/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
+++ b/ruby/ql/lib/codeql/ruby/ApiGraphs.qll
@@ -1,5 +1,5 @@
 /**
- * Provides an implementation of _API graphs_, which allow efficient modelling of how a given
+ * Provides an implementation of _API graphs_, which allow efficient modeling of how a given
  * value is used by the code base or how values produced by the code base are consumed by a library.
  *
  * See `API::Node` for more details.
diff --git a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
index 932533711984..bd13fca2875a 100644
--- a/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
+++ b/ruby/ql/lib/codeql/ruby/controlflow/BasicBlocks.qll
@@ -10,6 +10,7 @@ private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgNodes
 private import SuccessorTypes
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -296,3 +297,23 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+private class SuccessorTypeAlias = SuccessorType;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = CfgNode;
+
+  class SuccessorType = SuccessorTypeAlias;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
index d64450e46c2f..fa977dd4ce87 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/DataFlowPrivate.qll
@@ -280,6 +280,7 @@ predicate isNonConstantExpr(CfgNodes::ExprCfgNode n) {
 /** Provides logic related to captured variables. */
 module VariableCapture {
   private import codeql.dataflow.VariableCapture as Shared
+  private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(CfgNodes::ExprCfgNode e1, CfgNodes::ExprCfgNode e2) {
     e1 = getALastEvalNode(e2)
@@ -290,23 +291,14 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements Shared::InputSig<Location> {
+  private module CaptureInput implements Shared::InputSig<Location, BasicBlocks::Cfg::BasicBlock> {
     private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
-    private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
     private import TaintTrackingPrivate as TaintTrackingPrivate
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = this.getScope() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::Cfg::BasicBlock bb) {
+      result = bb.getScope()
     }
 
-    class ControlFlowNode = Cfg::CfgNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     class CapturedVariable extends LocalVariable {
       CapturedVariable() {
         this.isCaptured() and
@@ -377,7 +369,7 @@ module VariableCapture {
 
   class ClosureExpr = CaptureInput::ClosureExpr;
 
-  module Flow = Shared::Flow<Location, CaptureInput>;
+  module Flow = Shared::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
index fd1619b1c634..af5745f6fd3c 100644
--- a/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
+++ b/ruby/ql/lib/codeql/ruby/dataflow/internal/SsaImpl.qll
@@ -4,22 +4,16 @@ module;
 private import codeql.ssa.Ssa as SsaImplCommon
 private import codeql.ruby.AST
 private import codeql.ruby.CFG as Cfg
+private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
 private import codeql.ruby.controlflow.internal.ControlFlowGraphImpl as ControlFlowGraphImpl
 private import codeql.ruby.dataflow.SSA
 private import codeql.ruby.ast.Variable
 private import Cfg::CfgNodes::ExprNodes
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
-  private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
-  private import codeql.ruby.controlflow.BasicBlocks as BasicBlocks
-
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = Cfg::CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
+private class BasicBlock = BasicBlocks::Cfg::BasicBlock;
 
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
+  private import codeql.ruby.controlflow.ControlFlowGraph as Cfg
 
   class SourceVariable = LocalVariable;
 
@@ -66,7 +60,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -220,15 +214,14 @@ private predicate hasVariableReadWithCapturedWrite(
 
 pragma[noinline]
 deprecated private predicate adjacentDefReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2,
-  SsaInput::SourceVariable v
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2, SsaInput::SourceVariable v
 ) {
   Impl::adjacentDefReadExt(def, _, bb1, i1, bb2, i2) and
   v = def.getSourceVariable()
 }
 
 deprecated private predicate adjacentDefReachesReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
 ) {
   exists(SsaInput::SourceVariable v | adjacentDefReadExt(def, bb1, i1, bb2, i2, v) |
     def.definesAt(v, bb1, i1)
@@ -236,7 +229,7 @@ deprecated private predicate adjacentDefReachesReadExt(
     SsaInput::variableRead(bb1, i1, v, true)
   )
   or
-  exists(SsaInput::BasicBlock bb3, int i3 |
+  exists(BasicBlock bb3, int i3 |
     adjacentDefReachesReadExt(def, bb1, i1, bb3, i3) and
     SsaInput::variableRead(bb3, i3, _, false) and
     Impl::adjacentDefReadExt(def, _, bb3, i3, bb2, i2)
@@ -244,7 +237,7 @@ deprecated private predicate adjacentDefReachesReadExt(
 }
 
 deprecated private predicate adjacentDefReachesUncertainReadExt(
-  Definition def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
+  Definition def, BasicBlock bb1, int i1, BasicBlock bb2, int i2
 ) {
   adjacentDefReachesReadExt(def, bb1, i1, bb2, i2) and
   SsaInput::variableRead(bb2, i2, _, false)
@@ -252,13 +245,11 @@ deprecated private predicate adjacentDefReachesUncertainReadExt(
 
 /** Same as `lastRefRedef`, but skips uncertain reads. */
 pragma[nomagic]
-deprecated private predicate lastRefSkipUncertainReadsExt(
-  Definition def, SsaInput::BasicBlock bb, int i
-) {
+deprecated private predicate lastRefSkipUncertainReadsExt(Definition def, BasicBlock bb, int i) {
   Impl::lastRef(def, bb, i) and
   not SsaInput::variableRead(bb, i, def.getSourceVariable(), false)
   or
-  exists(SsaInput::BasicBlock bb0, int i0 |
+  exists(BasicBlock bb0, int i0 |
     Impl::lastRef(def, bb0, i0) and
     adjacentDefReachesUncertainReadExt(def, bb, i, bb0, i0)
   )
@@ -479,7 +470,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   private import codeql.util.Boolean
 
   class Expr extends Cfg::CfgNodes::ExprCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
@@ -495,9 +486,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(Cfg::SuccessorTypes::ConditionalSuccessor s |
         this.getBasicBlock() = bb1 and
         bb2 = bb1.getASuccessor(s) and
@@ -510,15 +499,13 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) {
     Guards::guardControlsBlock(guard, bb, branch)
   }
 }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
index 2746faebdc86..cef6cb4fa043 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/core/Kernel.qll
@@ -50,7 +50,7 @@ module Kernel {
   }
 
   /**
-   * Private methods in the `Kernel` module.
+   * Holds if `method` is a name of a private method in the `Kernel` module.
    * These can be be invoked on `self`, on `Kernel`, or using a low-level primitive like `send` or `instance_eval`.
    * ```ruby
    * puts "hello world"
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
index e2ba1eb48fec..9ffd5e3ef512 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/Excon.qll
@@ -25,27 +25,28 @@ private import codeql.ruby.DataFlow
  */
 class ExconHttpRequest extends Http::Client::Request::Range instanceof DataFlow::CallNode {
   API::Node requestNode;
-  API::Node connectionNode;
   DataFlow::Node connectionUse;
 
   ExconHttpRequest() {
     this = requestNode.asSource() and
-    connectionUse = connectionNode.asSource() and
-    connectionNode =
-      [
-        // one-off requests
-        API::getTopLevelMember("Excon"),
-        // connection re-use
-        API::getTopLevelMember("Excon").getInstance(),
-        API::getTopLevelMember("Excon").getMember("Connection").getInstance()
-      ] and
-    requestNode =
-      connectionNode
-          .getReturn([
-              // Excon#request exists but Excon.request doesn't.
-              // This shouldn't be a problem - in real code the latter would raise NoMethodError anyway.
-              "get", "head", "delete", "options", "post", "put", "patch", "trace", "request"
-            ])
+    exists(API::Node connectionNode |
+      connectionUse = connectionNode.asSource() and
+      connectionNode =
+        [
+          // one-off requests
+          API::getTopLevelMember("Excon"),
+          // connection re-use
+          API::getTopLevelMember("Excon").getInstance(),
+          API::getTopLevelMember("Excon").getMember("Connection").getInstance()
+        ] and
+      requestNode =
+        connectionNode
+            .getReturn([
+                // Excon#request exists but Excon.request doesn't.
+                // This shouldn't be a problem - in real code the latter would raise NoMethodError anyway.
+                "get", "head", "delete", "options", "post", "put", "patch", "trace", "request"
+              ])
+    )
   }
 
   override DataFlow::Node getResponseBody() { result = requestNode.getAMethodCall("body") }
diff --git a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
index bcb86e2b63d3..a1b58d700b8f 100644
--- a/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
+++ b/ruby/ql/lib/codeql/ruby/frameworks/http_clients/NetHttp.qll
@@ -27,11 +27,10 @@ private import codeql.ruby.DataFlow
 class NetHttpRequest extends Http::Client::Request::Range instanceof DataFlow::CallNode {
   private DataFlow::CallNode request;
   API::Node requestNode;
-  API::Node connectionNode;
   private boolean returnsResponseBody;
 
   NetHttpRequest() {
-    exists(string method |
+    exists(string method, API::Node connectionNode |
       request = requestNode.asSource() and
       this = request and
       requestNode = connectionNode.getReturn(method)
diff --git a/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll b/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
index d1f96ec407ee..d35d9353bf13 100644
--- a/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
+++ b/ruby/ql/lib/codeql/ruby/regexp/internal/ParseRegExp.qll
@@ -194,7 +194,7 @@ abstract class RegExp extends Ast::StringlikeLiteral {
   }
 
   /**
-   * Holds if the character set starting at `charset_start` contains a character range
+   * Holds if the character set starting at `charsetStart` contains a character range
    * with lower bound found between `start` and `lowerEnd`
    * and upper bound found between `upperStart` and `end`.
    */
diff --git a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
index 46fc231c6fc6..dab75f00b9e5 100644
--- a/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
+++ b/ruby/ql/lib/codeql/ruby/security/ImproperMemoizationQuery.qll
@@ -45,7 +45,7 @@ private class MemoCandidate extends Method {
 }
 
 /**
- * Holds if parameter `p` of `m` is read in the right hand side of `assign`.
+ * Holds if parameter `p` of `m` is read in the right hand side of `a`.
  */
 private predicate parameterUsedInMemoValue(Method m, Parameter p, MemoStmt a) {
   p = m.getAParameter() and
@@ -54,7 +54,7 @@ private predicate parameterUsedInMemoValue(Method m, Parameter p, MemoStmt a) {
 }
 
 /**
- * Holds if parameter `p` of `m` is read in the left hand side of `assign`.
+ * Holds if parameter `p` of `m` is read in the left hand side of `a`.
  */
 private predicate parameterUsedInMemoKey(Method m, Parameter p, HashMemoStmt a) {
   p = m.getAParameter() and
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index a6890d524781..4e7bacb8e37a 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 5.0.2
+version: 5.0.3
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/lib/utils/test/InlineFlowTest.qll b/ruby/ql/lib/utils/test/InlineFlowTest.qll
index 2444b04fb13e..7ef209380037 100644
--- a/ruby/ql/lib/utils/test/InlineFlowTest.qll
+++ b/ruby/ql/lib/utils/test/InlineFlowTest.qll
@@ -3,7 +3,7 @@
  * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
  */
 
-import ruby
+private import ruby
 private import codeql.Locations
 private import codeql.dataflow.test.InlineFlowTest
 private import codeql.ruby.dataflow.internal.DataFlowImplSpecific
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 469f84214132..29b4ff27bc09 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.4.4
+
+No user-facing changes.
+
 ## 1.4.3
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.4.4.md b/ruby/ql/src/change-notes/released/1.4.4.md
new file mode 100644
index 000000000000..cb7dd204b9c2
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.4.4.md
@@ -0,0 +1,3 @@
+## 1.4.4
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 08f88b689fb6..1dfca6daa3b1 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.4.3
+lastReleaseVersion: 1.4.4
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index e053d77fd57e..c91bc756159d 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.4.3
+version: 1.4.4
 groups:
   - ruby
   - queries
diff --git a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
index b34ee080fcdd..c81cdd6b2f63 100644
--- a/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
+++ b/ruby/ql/src/queries/performance/DatabaseQueryInLoop.ql
@@ -16,7 +16,6 @@ import codeql.ruby.ast.internal.Constant
 import codeql.ruby.Concepts
 import codeql.ruby.frameworks.ActiveRecord
 private import codeql.ruby.TaintTracking
-private import codeql.ruby.CFG
 private import codeql.ruby.controlflow.internal.Guards as Guards
 
 /** Gets the name of a built-in method that involves a loop operation. */
@@ -42,7 +41,7 @@ class LoopingCall extends DataFlow::CallNode {
 
 /** Holds if `ar` influences a guard that may control the execution of a loop. */
 predicate usedInLoopControlGuard(ActiveRecordInstance ar) {
-  exists(DataFlow::Node insideGuard, CfgNodes::ExprCfgNode guard |
+  exists(DataFlow::Node insideGuard, Cfg::CfgNodes::ExprCfgNode guard |
     // For a guard like `cond && ar`, the whole guard will not be tainted
     // so we need to look at the taint of the individual parts.
     insideGuard.asExpr().getExpr() = guard.getExpr().getAChild*()
@@ -53,12 +52,12 @@ predicate usedInLoopControlGuard(ActiveRecordInstance ar) {
 }
 
 /** Holds if `guard` controls `break` and `break` would break out of a loop. */
-predicate guardForLoopControl(CfgNodes::ExprCfgNode guard, CfgNodes::AstCfgNode break) {
+predicate guardForLoopControl(Cfg::CfgNodes::ExprCfgNode guard, Cfg::CfgNodes::AstCfgNode break) {
   Guards::guardControlsBlock(guard, break.getBasicBlock(), _) and
   (
-    break.(CfgNodes::ExprNodes::MethodCallCfgNode).getMethodName() = "raise"
+    break.(Cfg::CfgNodes::ExprNodes::MethodCallCfgNode).getMethodName() = "raise"
     or
-    break instanceof CfgNodes::ReturningCfgNode
+    break instanceof Cfg::CfgNodes::ReturningCfgNode
   )
 }
 
diff --git a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
index e7879fa600ae..8db21dd44964 100644
--- a/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
+++ b/ruby/ql/test/library-tests/controlflow/graph/BasicBlocks.ql
@@ -1,4 +1,3 @@
-import ruby
 import codeql.ruby.controlflow.ControlFlowGraph
 import codeql.ruby.controlflow.BasicBlocks
 
diff --git a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
index e485d98d361d..3828ea6b3ae1 100644
--- a/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
+++ b/ruby/ql/test/library-tests/dataflow/barrier-guards/barrier-flow.ql
@@ -2,8 +2,7 @@
  * @kind path-problem
  */
 
-import codeql.ruby.AST
-import codeql.ruby.CFG
+import ruby
 import utils.test.InlineFlowTest
 import codeql.ruby.dataflow.BarrierGuards
 import PathGraph
diff --git a/rust/README.md b/rust/README.md
index 8be853bd5f2c..4f462f1b70f6 100644
--- a/rust/README.md
+++ b/rust/README.md
@@ -1,8 +1,5 @@
 # Rust on CodeQL
 
-> [!WARNING]
-> Rust support for CodeQL is experimental. No support is offered. QL and database interfaces will change and break without notice or deprecation periods.
-
 ## Development
 
 ### Dependencies
diff --git a/rust/ast-generator/Cargo.toml b/rust/ast-generator/Cargo.toml
index 78c8a9b6d5bd..1c079952f71f 100644
--- a/rust/ast-generator/Cargo.toml
+++ b/rust/ast-generator/Cargo.toml
@@ -7,11 +7,11 @@ license = "MIT"
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 ungrammar = "1.16.1"
-proc-macro2 = "1.0.95"
+proc-macro2 = "1.0.97"
 quote = "1.0.40"
 either = "1.15.0"
-stdx = {package = "ra_ap_stdx", version = "0.0.288"}
+stdx = {package = "ra_ap_stdx", version = "0.0.300"}
 itertools = "0.14.0"
 mustache = "0.9.0"
 serde = { version = "1.0.219", features = ["derive"] }
-anyhow = "1.0.98"
+anyhow = "1.0.99"
diff --git a/rust/ast-generator/src/main.rs b/rust/ast-generator/src/main.rs
index d612985ff9f8..1fd2d143a155 100644
--- a/rust/ast-generator/src/main.rs
+++ b/rust/ast-generator/src/main.rs
@@ -62,15 +62,6 @@ fn has_special_emission(type_name: &str) -> bool {
             | "Struct"
             | "Enum"
             | "Union"
-            | "Trait"
-            | "Module"
-            | "Variant"
-            | "PathExpr"
-            | "RecordExpr"
-            | "PathPat"
-            | "RecordPat"
-            | "TupleStructPat"
-            | "MethodCallExpr"
             | "PathSegment"
             | "Const"
     )
@@ -82,6 +73,7 @@ fn should_enum_be_skipped(name: &str) -> bool {
 
 fn should_node_be_skipped(name: &str) -> bool {
     name == "TypeAnchor" // we flatten TypeAnchor into PathSegment in the extractor
+    || name == "MacroStmts" // we workaround a getter bug in the extractor
 }
 
 fn should_node_be_skipped_in_extractor(name: &str) -> bool {
diff --git a/rust/codeql-extractor.yml b/rust/codeql-extractor.yml
index c7785e5f8c72..6675dd3a2718 100644
--- a/rust/codeql-extractor.yml
+++ b/rust/codeql-extractor.yml
@@ -5,6 +5,8 @@ column_kind: "utf8"
 legacy_qltest_extraction: true
 build_modes:
   - none
+default_queries:
+  - codeql/rust-queries
 github_api_languages:
   - Rust
 scc_languages:
@@ -80,12 +82,6 @@ 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.
-    type: string
-    pattern: "^(false|true)$"
   extract_dependencies_as_source:
     title: Extract dependencies as source code
     description: >
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql
new file mode 100644
index 000000000000..56e3d5b652c8
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/downgrade.ql
@@ -0,0 +1,93 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+query predicate new_closure_binders(Element id) {
+  for_binders(id) and closure_expr_for_binders(_, id)
+}
+
+query predicate new_closure_binder_generic_param_lists(Element id, Element list) {
+  for_binder_generic_param_lists(id, list) and closure_expr_for_binders(_, id)
+}
+
+query predicate new_where_pred_generic_param_lists(Element id, Element list) {
+  exists(Element forBinder |
+    where_pred_for_binders(id, forBinder) and
+    for_binder_generic_param_lists(forBinder, list)
+  )
+}
+
+// We need to transform `TypeBound(for_binder=ForBinder(generic_param_list=X), type_repr=Y)`
+// into `TypeBound(type_repr=ForTypeRepr(generic_param_list=X, type_repr=Y))`
+// we repurpose the `@for_binder` id into a `@for_type_repr` one
+query predicate new_for_type_reprs(Element id) {
+  for_type_reprs(id) or
+  exists(Element typeBound | type_bound_for_binders(typeBound, id))
+}
+
+query predicate new_for_type_repr_generic_param_lists(Element id, Element list) {
+  exists(Element forBinder |
+    for_type_repr_for_binders(id, forBinder) and for_binder_generic_param_lists(forBinder, list)
+  )
+  or
+  exists(Element typeBound |
+    type_bound_for_binders(typeBound, id) and for_binder_generic_param_lists(id, list)
+  )
+}
+
+query predicate new_for_type_repr_type_reprs(Element id, Element type) {
+  for_type_repr_type_reprs(id, type)
+  or
+  exists(Element typeBound |
+    type_bound_for_binders(typeBound, id) and type_bound_type_reprs(typeBound, type)
+  )
+}
+
+query predicate new_type_bound_type_reprs(Element bound, Element type) {
+  type_bound_type_reprs(bound, type) and not type_bound_for_binders(bound, _)
+  or
+  type_bound_for_binders(bound, type)
+}
+
+// remove locations of removed @for_binder elements
+query predicate new_locatable_locations(Element id, Location loc) {
+  locatable_locations(id, loc) and not where_pred_for_binders(_, id)
+}
+
+// remove @asm_expr from the subtypes of @item (and therefore @addressable and @stmt)
+// this means removing any @asm_expr ids from tables that accept @item, @stmt or @addressable
+query predicate new_item_attribute_macro_expansions(Element id, Element items) {
+  item_attribute_macro_expansions(id, items) and not asm_exprs(id)
+}
+
+query predicate new_item_list_items(Element id, int index, Element item) {
+  item_list_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_macro_items_items(Element id, int index, Element item) {
+  macro_items_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_source_file_items(Element id, int index, Element item) {
+  source_file_items(id, index, item) and not asm_exprs(item)
+}
+
+query predicate new_stmt_list_statements(Element id, int index, Element stmt) {
+  stmt_list_statements(id, index, stmt) and not asm_exprs(stmt)
+}
+
+query predicate new_macro_block_expr_statements(Element id, int index, Element stmt) {
+  macro_block_expr_statements(id, index, stmt) and not asm_exprs(stmt)
+}
+
+query predicate new_addressable_extended_canonical_paths(Element id, string path) {
+  addressable_extended_canonical_paths(id, path) and not asm_exprs(id)
+}
+
+query predicate new_addressable_crate_origins(Element id, string crate) {
+  addressable_crate_origins(id, crate) and not asm_exprs(id)
+}
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
new file mode 100644
index 000000000000..b41e55c0dba1
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
new file mode 100644
index 000000000000..319c933d9615
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
@@ -0,0 +1,3637 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
new file mode 100644
index 000000000000..8376124b7f8f
--- /dev/null
+++ b/rust/downgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
@@ -0,0 +1,29 @@
+description: Revert rust-analyzer upgrade to 0.0.300
+compatibility: backwards
+
+for_type_repr_for_binders.rel: delete
+where_pred_for_binders.rel: delete
+type_bound_for_binders.rel: delete
+for_binders.rel: delete
+for_binder_generic_param_lists.rel: delete
+closure_expr_for_binders.rel: delete
+
+closure_expr_closure_binders.rel: reorder closure_expr_for_binders.rel (@closure_expr id, @for_binder binder) id binder
+
+closure_binders.rel: run downgrade.ql new_closure_binders
+closure_binder_generic_param_lists.rel: run downgrade.ql new_closure_binder_generic_param_lists
+where_pred_generic_param_lists.rel: run downgrade.ql new_where_pred_generic_param_lists
+for_type_reprs.rel: run downgrade.ql new_for_type_reprs
+for_type_repr_generic_param_lists.rel: run downgrade.ql new_for_type_repr_generic_param_lists
+for_type_repr_type_reprs.rel: run downgrade.ql new_for_type_repr_type_reprs
+type_bound_type_reprs.rel: run downgrade.ql new_type_bound_type_reprs
+locatable_locations.rel: run downgrade.ql new_locatable_locations
+
+item_attribute_macro_expansions.rel: run downgrade.ql new_item_attribute_macro_expansions
+item_list_items.rel: run downgrade.ql new_item_list_items
+macro_items_items.rel: run downgrade.ql new_macro_items_items
+source_file_items.rel: run downgrade.ql new_source_file_items
+stmt_list_statements.rel: run downgrade.ql new_stmt_list_statements
+macro_block_expr_statements.rel: run downgrade.ql new_macro_block_expr_statements
+addressable_extended_canonical_paths.rel: run downgrade.ql new_addressable_extended_canonical_paths
+addressable_crate_origins.rel: run downgrade.ql new_addressable_crate_origins
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
new file mode 100644
index 000000000000..dfade44a27bd
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/old.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr 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_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
+);
+
+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
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
new file mode 100644
index 000000000000..b41e55c0dba1
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/rust.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
new file mode 100644
index 000000000000..05ada67c81b4
--- /dev/null
+++ b/rust/downgrades/dfade44a27bd44db996ae8c5095a11effc883aba/upgrade.properties
@@ -0,0 +1,2 @@
+description: Revert removing extractor generated paths
+compatibility: partial
diff --git a/rust/extractor/Cargo.toml b/rust/extractor/Cargo.toml
index 88a3e203a278..ed9915b2877d 100644
--- a/rust/extractor/Cargo.toml
+++ b/rust/extractor/Cargo.toml
@@ -6,39 +6,39 @@ license = "MIT"
 
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
-anyhow = "1.0.98"
-clap = { version = "4.5.40", features = ["derive"] }
+anyhow = "1.0.99"
+clap = { version = "4.5.44", features = ["derive"] }
 figment = { version = "0.10.19", features = ["env", "yaml"] }
 num-traits = "0.2.19"
-ra_ap_base_db = "0.0.288"
-ra_ap_hir = "0.0.288"
-ra_ap_hir_def = "0.0.288"
-ra_ap_ide_db = "0.0.288"
-ra_ap_hir_ty = "0.0.288"
-ra_ap_hir_expand = "0.0.288"
-ra_ap_load-cargo = "0.0.288"
-ra_ap_paths = "0.0.288"
-ra_ap_project_model = "0.0.288"
-ra_ap_syntax = "0.0.288"
-ra_ap_vfs = "0.0.288"
-ra_ap_parser = "0.0.288"
-ra_ap_span = "0.0.288"
-ra_ap_cfg = "0.0.288"
-ra_ap_intern = "0.0.288"
+ra_ap_base_db = "0.0.300"
+ra_ap_hir = "0.0.300"
+ra_ap_hir_def = "0.0.300"
+ra_ap_ide_db = "0.0.300"
+ra_ap_hir_ty = "0.0.300"
+ra_ap_hir_expand = "0.0.300"
+ra_ap_load-cargo = "0.0.300"
+ra_ap_paths = "0.0.300"
+ra_ap_project_model = "0.0.300"
+ra_ap_syntax = "0.0.300"
+ra_ap_vfs = "0.0.300"
+ra_ap_parser = "0.0.300"
+ra_ap_span = "0.0.300"
+ra_ap_cfg = "0.0.300"
+ra_ap_intern = "0.0.300"
 serde = "1.0.219"
-serde_with = "3.13.0"
+serde_with = "3.14.0"
 triomphe = "0.1.14"
 argfile = "0.2.1"
 codeql-extractor = { path = "../../shared/tree-sitter-extractor" }
 rust-extractor-macros = { path = "macros" }
 itertools = "0.14.0"
-glob = "0.3.2"
+glob = "0.3.3"
 chrono = { version = "0.4.41", features = ["serde"] }
-serde_json = "1.0.140"
+serde_json = "1.0.142"
 dunce = "1.0.5"
-toml = "0.8.23"
+toml = "0.9.5"
 tracing = "0.1.41"
 tracing-flame = "0.2.0"
 tracing-subscriber = "0.3.19"
-chalk-ir = "0.103.0"
+chalk-ir = "0.104.0"
 mustache = "0.9.0"
diff --git a/rust/extractor/macros/Cargo.toml b/rust/extractor/macros/Cargo.toml
index 3444aa98758e..e666bf755105 100644
--- a/rust/extractor/macros/Cargo.toml
+++ b/rust/extractor/macros/Cargo.toml
@@ -10,4 +10,4 @@ proc-macro = true
 # When updating these dependencies, run `rust/update_cargo_deps.sh`
 [dependencies]
 quote = "1.0.40"
-syn = { version = "2.0.103", features = ["full"] }
+syn = { version = "2.0.104", features = ["full"] }
diff --git a/rust/extractor/src/config.rs b/rust/extractor/src/config.rs
index a26bf790f825..86d3ab6272c8 100644
--- a/rust/extractor/src/config.rs
+++ b/rust/extractor/src/config.rs
@@ -69,7 +69,6 @@ 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,
     pub extract_dependencies_as_source: bool,
     pub force_library_mode: bool, // for testing purposes
 }
diff --git a/rust/extractor/src/generated/.generated.list b/rust/extractor/src/generated/.generated.list
index 4dcfb5380e12..247613daec2c 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 409eb2e5fb18cb360a7d255fc2d7926a78bcd2d3c9f8dcdfce0419cea49d1489 409eb2e5fb18cb360a7d255fc2d7926a78bcd2d3c9f8dcdfce0419cea49d1489
+top.rs ef1e4ee1ec10669092c216f95bc34a1740e1fadfc4f3ad91ef14dccc5f2a7490 ef1e4ee1ec10669092c216f95bc34a1740e1fadfc4f3ad91ef14dccc5f2a7490
diff --git a/rust/extractor/src/generated/top.rs b/rust/extractor/src/generated/top.rs
index 278f4e59ab95..ef25c5aecc13 100644
--- a/rust/extractor/src/generated/top.rs
+++ b/rust/extractor/src/generated/top.rs
@@ -331,17 +331,6 @@ pub struct Addressable {
     _unused: ()
 }
 
-impl Addressable {
-    pub fn emit_extended_canonical_path(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("addressable_extended_canonical_paths", vec![id.into(), value.into()]);
-    }
-
-    pub fn emit_crate_origin(id: trap::Label<Self>, value: String, out: &mut trap::Writer) {
-        out.add_tuple("addressable_crate_origins", vec![id.into(), value.into()]);
-    }
-
-}
-
 impl trap::TrapClass for Addressable {
     fn class_name() -> &'static str { "Addressable" }
 }
@@ -835,56 +824,6 @@ impl From<trap::Label<Callable>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct ClosureBinder {
-    pub id: trap::TrapId<ClosureBinder>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
-}
-
-impl trap::TrapEntry for ClosureBinder {
-    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("closure_binders", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("closure_binder_generic_param_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for ClosureBinder {
-    fn class_name() -> &'static str { "ClosureBinder" }
-}
-
-impl From<trap::Label<ClosureBinder>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<ClosureBinder>) -> Self {
-        // SAFETY: this is safe because in the dbscheme ClosureBinder is a subclass of AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Expr {
     _unused: ()
@@ -1011,6 +950,56 @@ impl From<trap::Label<FieldList>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct ForBinder {
+    pub id: trap::TrapId<ForBinder>,
+    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+}
+
+impl trap::TrapEntry for ForBinder {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
+
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("for_binders", vec![id.into()]);
+        if let Some(v) = self.generic_param_list {
+            out.add_tuple("for_binder_generic_param_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for ForBinder {
+    fn class_name() -> &'static str { "ForBinder" }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<ForBinder>> for trap::Label<Element> {
+    fn from(value: trap::Label<ForBinder>) -> Self {
+        // SAFETY: this is safe because in the dbscheme ForBinder is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct FormatArgsArg {
     pub id: trap::TrapId<FormatArgsArg>,
@@ -1949,6 +1938,42 @@ impl From<trap::Label<Path>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+pub struct PathAstNode {
+    _unused: ()
+}
+
+impl trap::TrapClass for PathAstNode {
+    fn class_name() -> &'static str { "PathAstNode" }
+}
+
+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 AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathAstNode>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathAstNode>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+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 Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct PathSegment {
     pub id: trap::TrapId<PathSegment>,
@@ -2076,53 +2101,6 @@ impl From<trap::Label<Rename>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct Resolvable {
-    _unused: ()
-}
-
-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()]);
-    }
-
-    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 Resolvable {
-    fn class_name() -> &'static str { "Resolvable" }
-}
-
-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<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<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())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct RetTypeRepr {
     pub id: trap::TrapId<RetTypeRepr>,
@@ -2808,6 +2786,7 @@ impl From<trap::Label<TupleField>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct TypeBound {
     pub id: trap::TrapId<TypeBound>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub is_async: bool,
     pub is_const: bool,
     pub lifetime: Option<trap::Label<Lifetime>>,
@@ -2822,6 +2801,9 @@ impl trap::TrapEntry for TypeBound {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("type_bounds", vec![id.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("type_bound_for_binders", vec![id.into(), v.into()]);
+        }
         if self.is_async {
             out.add_tuple("type_bound_is_async", vec![id.into()]);
         }
@@ -3308,7 +3290,7 @@ impl From<trap::Label<WhereClause>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct WherePred {
     pub id: trap::TrapId<WherePred>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub lifetime: Option<trap::Label<Lifetime>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
     pub type_bound_list: Option<trap::Label<TypeBoundList>>,
@@ -3321,8 +3303,8 @@ impl trap::TrapEntry for WherePred {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("where_preds", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("where_pred_generic_param_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("where_pred_for_binders", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.lifetime {
             out.add_tuple("where_pred_lifetimes", vec![id.into(), v.into()]);
@@ -3615,73 +3597,6 @@ impl From<trap::Label<AsmConst>> for trap::Label<Element> {
     }
 }
 
-#[derive(Debug)]
-pub struct AsmExpr {
-    pub id: trap::TrapId<AsmExpr>,
-    pub asm_pieces: Vec<trap::Label<AsmPiece>>,
-    pub attrs: Vec<trap::Label<Attr>>,
-    pub template: Vec<trap::Label<Expr>>,
-}
-
-impl trap::TrapEntry for AsmExpr {
-    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("asm_exprs", vec![id.into()]);
-        for (i, v) in self.asm_pieces.into_iter().enumerate() {
-            out.add_tuple("asm_expr_asm_pieces", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.attrs.into_iter().enumerate() {
-            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
-        }
-        for (i, v) in self.template.into_iter().enumerate() {
-            out.add_tuple("asm_expr_templates", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for AsmExpr {
-    fn class_name() -> &'static str { "AsmExpr" }
-}
-
-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 Expr
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct AsmLabel {
     pub id: trap::TrapId<AsmLabel>,
@@ -4517,7 +4432,7 @@ pub struct ClosureExpr {
     pub param_list: Option<trap::Label<ParamList>>,
     pub attrs: Vec<trap::Label<Attr>>,
     pub body: Option<trap::Label<Expr>>,
-    pub closure_binder: Option<trap::Label<ClosureBinder>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub is_async: bool,
     pub is_const: bool,
     pub is_gen: bool,
@@ -4542,8 +4457,8 @@ impl trap::TrapEntry for ClosureExpr {
         if let Some(v) = self.body {
             out.add_tuple("closure_expr_bodies", vec![id.into(), v.into()]);
         }
-        if let Some(v) = self.closure_binder {
-            out.add_tuple("closure_expr_closure_binders", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("closure_expr_for_binders", vec![id.into(), v.into()]);
         }
         if self.is_async {
             out.add_tuple("closure_expr_is_async", vec![id.into()]);
@@ -5199,7 +5114,7 @@ impl From<trap::Label<FnPtrTypeRepr>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct ForTypeRepr {
     pub id: trap::TrapId<ForTypeRepr>,
-    pub generic_param_list: Option<trap::Label<GenericParamList>>,
+    pub for_binder: Option<trap::Label<ForBinder>>,
     pub type_repr: Option<trap::Label<TypeRepr>>,
 }
 
@@ -5210,8 +5125,8 @@ impl trap::TrapEntry for ForTypeRepr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("for_type_reprs", vec![id.into()]);
-        if let Some(v) = self.generic_param_list {
-            out.add_tuple("for_type_repr_generic_param_lists", vec![id.into(), v.into()]);
+        if let Some(v) = self.for_binder {
+            out.add_tuple("for_type_repr_for_binders", vec![id.into(), v.into()]);
         }
         if let Some(v) = self.type_repr {
             out.add_tuple("for_type_repr_type_reprs", vec![id.into(), v.into()]);
@@ -6211,8 +6126,8 @@ impl From<trap::Label<LiteralPat>> for trap::Label<Element> {
 #[derive(Debug)]
 pub struct MacroBlockExpr {
     pub id: trap::TrapId<MacroBlockExpr>,
-    pub tail_expr: Option<trap::Label<Expr>>,
     pub statements: Vec<trap::Label<Stmt>>,
+    pub tail_expr: Option<trap::Label<Expr>>,
 }
 
 impl trap::TrapEntry for MacroBlockExpr {
@@ -6222,12 +6137,12 @@ impl trap::TrapEntry for MacroBlockExpr {
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
         out.add_tuple("macro_block_exprs", vec![id.into()]);
-        if let Some(v) = self.tail_expr {
-            out.add_tuple("macro_block_expr_tail_exprs", vec![id.into(), v.into()]);
-        }
         for (i, v) in self.statements.into_iter().enumerate() {
             out.add_tuple("macro_block_expr_statements", vec![id.into(), i.into(), v.into()]);
         }
+        if let Some(v) = self.tail_expr {
+            out.add_tuple("macro_block_expr_tail_exprs", vec![id.into(), v.into()]);
+        }
     }
 }
 
@@ -7004,44 +6919,44 @@ impl From<trap::Label<ParenTypeRepr>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct PathAstNode {
+pub struct PathExprBase {
     _unused: ()
 }
 
-impl trap::TrapClass for PathAstNode {
-    fn class_name() -> &'static str { "PathAstNode" }
+impl trap::TrapClass for PathExprBase {
+    fn class_name() -> &'static str { "PathExprBase" }
 }
 
-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 Resolvable
+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 Expr
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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 AstNode
+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 AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<PathAstNode>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathAstNode>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathAstNode is a subclass of Locatable
+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 Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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 Element
+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 Element
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7049,44 +6964,67 @@ impl From<trap::Label<PathAstNode>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct PathExprBase {
-    _unused: ()
+pub struct PathPat {
+    pub id: trap::TrapId<PathPat>,
+    pub path: Option<trap::Label<Path>>,
 }
 
-impl trap::TrapClass for PathExprBase {
-    fn class_name() -> &'static str { "PathExprBase" }
-}
+impl trap::TrapEntry for PathPat {
+    fn extract_id(&mut self) -> trap::TrapId<Self> {
+        std::mem::replace(&mut self.id, trap::TrapId::Star)
+    }
 
-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 Expr
+    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
+        out.add_tuple("path_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for PathPat {
+    fn class_name() -> &'static str { "PathPat" }
+}
+
+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 Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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 AstNode
+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 AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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 Locatable
+impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-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 Element
+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 Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<PathPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<PathPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of PathAstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -7948,6 +7886,78 @@ impl From<trap::Label<SliceTypeRepr>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+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 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("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.struct_expr_field_list {
+            out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for StructExpr {
+    fn class_name() -> &'static str { "StructExpr" }
+}
+
+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<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<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<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<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())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct StructFieldList {
     pub id: trap::TrapId<StructFieldList>,
@@ -8007,6 +8017,78 @@ impl From<trap::Label<StructFieldList>> for trap::Label<Element> {
     }
 }
 
+#[derive(Debug)]
+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 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("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.struct_pat_field_list {
+            out.add_tuple("struct_pat_struct_pat_field_lists", vec![id.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for StructPat {
+    fn class_name() -> &'static str { "StructPat" }
+}
+
+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<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<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<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<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())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct TryExpr {
     pub id: trap::TrapId<TryExpr>,
@@ -8252,58 +8334,71 @@ impl From<trap::Label<TuplePat>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct TupleTypeRepr {
-    pub id: trap::TrapId<TupleTypeRepr>,
-    pub fields: Vec<trap::Label<TypeRepr>>,
+pub struct TupleStructPat {
+    pub id: trap::TrapId<TupleStructPat>,
+    pub path: Option<trap::Label<Path>>,
+    pub fields: Vec<trap::Label<Pat>>,
 }
 
-impl trap::TrapEntry for TupleTypeRepr {
+impl trap::TrapEntry for TupleStructPat {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_type_reprs", vec![id.into()]);
+        out.add_tuple("tuple_struct_pats", vec![id.into()]);
+        if let Some(v) = self.path {
+            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
+        }
         for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("tuple_type_repr_fields", vec![id.into(), i.into(), v.into()]);
+            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
         }
     }
 }
 
-impl trap::TrapClass for TupleTypeRepr {
-    fn class_name() -> &'static str { "TupleTypeRepr" }
+impl trap::TrapClass for TupleStructPat {
+    fn class_name() -> &'static str { "TupleStructPat" }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<TypeRepr> {
-    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of TypeRepr
+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 Pat
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<AstNode> {
-    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of AstNode
+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 AstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Locatable
+impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
     }
 }
 
-impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
-    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Element
+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 Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleStructPat>> for trap::Label<PathAstNode> {
+    fn from(value: trap::Label<TupleStructPat>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of PathAstNode
         unsafe {
             Self::from_untyped(value.as_untyped())
         }
@@ -8311,19 +8406,78 @@ impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
 }
 
 #[derive(Debug)]
-pub struct TypeArg {
-    pub id: trap::TrapId<TypeArg>,
-    pub type_repr: Option<trap::Label<TypeRepr>>,
+pub struct TupleTypeRepr {
+    pub id: trap::TrapId<TupleTypeRepr>,
+    pub fields: Vec<trap::Label<TypeRepr>>,
 }
 
-impl trap::TrapEntry for TypeArg {
+impl trap::TrapEntry for TupleTypeRepr {
     fn extract_id(&mut self) -> trap::TrapId<Self> {
         std::mem::replace(&mut self.id, trap::TrapId::Star)
     }
 
     fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("type_args", vec![id.into()]);
-        if let Some(v) = self.type_repr {
+        out.add_tuple("tuple_type_reprs", vec![id.into()]);
+        for (i, v) in self.fields.into_iter().enumerate() {
+            out.add_tuple("tuple_type_repr_fields", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for TupleTypeRepr {
+    fn class_name() -> &'static str { "TupleTypeRepr" }
+}
+
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<TypeRepr> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of TypeRepr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<AstNode> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Locatable> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<TupleTypeRepr>> for trap::Label<Element> {
+    fn from(value: trap::Label<TupleTypeRepr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme TupleTypeRepr is a subclass of Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct TypeArg {
+    pub id: trap::TrapId<TypeArg>,
+    pub type_repr: Option<trap::Label<TypeRepr>>,
+}
+
+impl trap::TrapEntry for TypeArg {
+    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("type_args", vec![id.into()]);
+        if let Some(v) = self.type_repr {
             out.add_tuple("type_arg_type_reprs", vec![id.into(), v.into()]);
         }
     }
@@ -8831,6 +8985,100 @@ impl From<trap::Label<Adt>> for trap::Label<Addressable> {
     }
 }
 
+#[derive(Debug)]
+pub struct AsmExpr {
+    pub id: trap::TrapId<AsmExpr>,
+    pub asm_pieces: Vec<trap::Label<AsmPiece>>,
+    pub attrs: Vec<trap::Label<Attr>>,
+    pub template: Vec<trap::Label<Expr>>,
+}
+
+impl trap::TrapEntry for AsmExpr {
+    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("asm_exprs", vec![id.into()]);
+        for (i, v) in self.asm_pieces.into_iter().enumerate() {
+            out.add_tuple("asm_expr_asm_pieces", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.attrs.into_iter().enumerate() {
+            out.add_tuple("asm_expr_attrs", vec![id.into(), i.into(), v.into()]);
+        }
+        for (i, v) in self.template.into_iter().enumerate() {
+            out.add_tuple("asm_expr_templates", vec![id.into(), i.into(), v.into()]);
+        }
+    }
+}
+
+impl trap::TrapClass for AsmExpr {
+    fn class_name() -> &'static str { "AsmExpr" }
+}
+
+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 Expr
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+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 AstNode
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+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 Locatable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+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 Element
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Item> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Item
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Stmt> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Stmt
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
+impl From<trap::Label<AsmExpr>> for trap::Label<Addressable> {
+    fn from(value: trap::Label<AsmExpr>) -> Self {
+        // SAFETY: this is safe because in the dbscheme AsmExpr is a subclass of Addressable
+        unsafe {
+            Self::from_untyped(value.as_untyped())
+        }
+    }
+}
+
 #[derive(Debug)]
 pub struct AssocItem {
     _unused: ()
@@ -9744,15 +9992,6 @@ impl From<trap::Label<MethodCallExpr>> for trap::Label<Element> {
     }
 }
 
-impl From<trap::Label<MethodCallExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<MethodCallExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme MethodCallExpr is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Module {
     pub id: trap::TrapId<Module>,
@@ -9923,254 +10162,6 @@ impl From<trap::Label<PathExpr>> for trap::Label<PathAstNode> {
     }
 }
 
-impl From<trap::Label<PathExpr>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<PathExpr>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathExpr is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-pub struct PathPat {
-    pub id: trap::TrapId<PathPat>,
-    pub path: Option<trap::Label<Path>>,
-}
-
-impl trap::TrapEntry for PathPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("path_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for PathPat {
-    fn class_name() -> &'static str { "PathPat" }
-}
-
-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 Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<PathPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<PathPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme PathPat is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-#[derive(Debug)]
-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 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("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.struct_expr_field_list {
-            out.add_tuple("struct_expr_struct_expr_field_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for StructExpr {
-    fn class_name() -> &'static str { "StructExpr" }
-}
-
-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<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<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<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<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<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())
-        }
-    }
-}
-
-#[derive(Debug)]
-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 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("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.struct_pat_field_list {
-            out.add_tuple("struct_pat_struct_pat_field_lists", vec![id.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for StructPat {
-    fn class_name() -> &'static str { "StructPat" }
-}
-
-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<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<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<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<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<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())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Trait {
     pub id: trap::TrapId<Trait>,
@@ -10377,87 +10368,6 @@ impl From<trap::Label<TraitAlias>> for trap::Label<Addressable> {
     }
 }
 
-#[derive(Debug)]
-pub struct TupleStructPat {
-    pub id: trap::TrapId<TupleStructPat>,
-    pub path: Option<trap::Label<Path>>,
-    pub fields: Vec<trap::Label<Pat>>,
-}
-
-impl trap::TrapEntry for TupleStructPat {
-    fn extract_id(&mut self) -> trap::TrapId<Self> {
-        std::mem::replace(&mut self.id, trap::TrapId::Star)
-    }
-
-    fn emit(self, id: trap::Label<Self>, out: &mut trap::Writer) {
-        out.add_tuple("tuple_struct_pats", vec![id.into()]);
-        if let Some(v) = self.path {
-            out.add_tuple("path_ast_node_paths", vec![id.into(), v.into()]);
-        }
-        for (i, v) in self.fields.into_iter().enumerate() {
-            out.add_tuple("tuple_struct_pat_fields", vec![id.into(), i.into(), v.into()]);
-        }
-    }
-}
-
-impl trap::TrapClass for TupleStructPat {
-    fn class_name() -> &'static str { "TupleStructPat" }
-}
-
-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 Pat
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 AstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Locatable> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Locatable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-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 Element
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<PathAstNode> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of PathAstNode
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
-impl From<trap::Label<TupleStructPat>> for trap::Label<Resolvable> {
-    fn from(value: trap::Label<TupleStructPat>) -> Self {
-        // SAFETY: this is safe because in the dbscheme TupleStructPat is a subclass of Resolvable
-        unsafe {
-            Self::from_untyped(value.as_untyped())
-        }
-    }
-}
-
 #[derive(Debug)]
 pub struct Use {
     pub id: trap::TrapId<Use>,
diff --git a/rust/extractor/src/main.rs b/rust/extractor/src/main.rs
index 1c8629cbbb90..e90badc63cd0 100644
--- a/rust/extractor/src/main.rs
+++ b/rust/extractor/src/main.rs
@@ -1,6 +1,6 @@
 use crate::diagnostics::{ExtractionStep, emit_extraction_diagnostics};
-use crate::rust_analyzer::path_to_file_id;
-use crate::translate::{ResolvePaths, SourceKind};
+use crate::rust_analyzer::{RustAnalyzerNoSemantics, path_to_file_id};
+use crate::translate::SourceKind;
 use crate::trap::TrapId;
 use anyhow::Context;
 use archive::Archiver;
@@ -50,13 +50,7 @@ impl<'a> Extractor<'a> {
         }
     }
 
-    fn extract(
-        &mut self,
-        rust_analyzer: &RustAnalyzer,
-        file: &Path,
-        resolve_paths: ResolvePaths,
-        source_kind: SourceKind,
-    ) {
+    fn extract(&mut self, rust_analyzer: &RustAnalyzer, file: &Path, source_kind: SourceKind) {
         self.archiver.archive(file);
         let before_parse = Instant::now();
         let ParseResult {
@@ -79,7 +73,6 @@ impl<'a> Extractor<'a> {
             label,
             line_index,
             semantics_info.as_ref().ok(),
-            resolve_paths,
             source_kind,
         );
 
@@ -87,14 +80,12 @@ impl<'a> Extractor<'a> {
             translator.emit_parse_error(&ast, &err);
         }
         let no_location = (LineCol { line: 0, col: 0 }, LineCol { line: 0, col: 0 });
-        if let Err(reason) = semantics_info {
+        if let Err(RustAnalyzerNoSemantics { severity, reason }) = semantics_info {
             if !reason.is_empty() {
                 let message = format!("semantic analyzer unavailable ({reason})");
-                let full_message = format!(
-                    "{message}: macro expansion, call graph, and type inference will be skipped."
-                );
+                let full_message = format!("{message}: macro expansion will be skipped.");
                 translator.emit_diagnostic(
-                    trap::DiagnosticSeverity::Warning,
+                    severity,
                     "semantics".to_owned(),
                     message,
                     full_message,
@@ -120,29 +111,18 @@ impl<'a> Extractor<'a> {
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
-        resolve_paths: ResolvePaths,
         source_kind: SourceKind,
     ) {
-        self.extract(
-            &RustAnalyzer::new(vfs, semantics),
-            file,
-            resolve_paths,
-            source_kind,
-        );
+        self.extract(&RustAnalyzer::new(vfs, semantics), file, source_kind);
     }
 
     pub fn extract_without_semantics(
         &mut self,
         file: &Path,
         source_kind: SourceKind,
-        reason: &str,
+        err: RustAnalyzerNoSemantics,
     ) {
-        self.extract(
-            &RustAnalyzer::WithoutSemantics { reason },
-            file,
-            ResolvePaths::No,
-            source_kind,
-        );
+        self.extract(&RustAnalyzer::from(err), file, source_kind);
     }
 
     pub fn load_manifest(
@@ -163,21 +143,25 @@ impl<'a> Extractor<'a> {
         file: &Path,
         semantics: &Semantics<'_, RootDatabase>,
         vfs: &Vfs,
-    ) -> Result<(), String> {
+    ) -> Result<(), RustAnalyzerNoSemantics> {
         let before = Instant::now();
         let Some(id) = path_to_file_id(file, vfs) else {
-            return Err("not included in files loaded from manifest".to_string());
+            return Err(RustAnalyzerNoSemantics::warning(
+                "not included in files loaded from manifest",
+            ));
         };
         match semantics.file_to_module_def(id) {
-            None => return Err("not included as a module".to_string()),
+            None => {
+                return Err(RustAnalyzerNoSemantics::info("not included as a module"));
+            }
             Some(module)
                 if module
                     .as_source_file_id(semantics.db)
                     .is_none_or(|mod_file_id| mod_file_id.file_id(semantics.db) != id) =>
             {
-                return Err(
-                    "not loaded as its own module, probably included by `!include`".to_string(),
-                );
+                return Err(RustAnalyzerNoSemantics::info(
+                    "not loaded as its own module, probably included by `!include`",
+                ));
             }
             _ => {}
         };
@@ -279,24 +263,23 @@ fn main() -> anyhow::Result<()> {
                 continue 'outer;
             }
         }
-        extractor.extract_without_semantics(file, SourceKind::Source, "no manifest found");
+        extractor.extract_without_semantics(
+            file,
+            SourceKind::Source,
+            RustAnalyzerNoSemantics::warning("no manifest found"),
+        );
     }
     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
-    };
-    let (library_mode, library_resolve_paths) = if cfg.extract_dependencies_as_source {
-        (SourceKind::Source, resolve_paths)
+    let library_mode = if cfg.extract_dependencies_as_source {
+        SourceKind::Source
     } else {
-        (SourceKind::Library, ResolvePaths::No)
+        SourceKind::Library
     };
-    let (source_mode, source_resolve_paths) = if cfg.force_library_mode {
-        (library_mode, library_resolve_paths)
+    let source_mode = if cfg.force_library_mode {
+        library_mode
     } else {
-        (SourceKind::Source, resolve_paths)
+        SourceKind::Source
     };
     let mut processed_files: HashSet<PathBuf, RandomState> =
         HashSet::from_iter(files.iter().cloned());
@@ -312,14 +295,8 @@ fn main() -> anyhow::Result<()> {
             let semantics = Semantics::new(db);
             for file in files {
                 match extractor.load_source(file, &semantics, vfs) {
-                    Ok(()) => extractor.extract_with_semantics(
-                        file,
-                        &semantics,
-                        vfs,
-                        source_resolve_paths,
-                        source_mode,
-                    ),
-                    Err(reason) => extractor.extract_without_semantics(file, source_mode, &reason),
+                    Ok(()) => extractor.extract_with_semantics(file, &semantics, vfs, source_mode),
+                    Err(e) => extractor.extract_without_semantics(file, source_mode, e),
                 };
             }
             for (file_id, file) in vfs.iter() {
@@ -331,13 +308,7 @@ fn main() -> anyhow::Result<()> {
                             .source_root(db)
                             .is_library
                     {
-                        extractor.extract_with_semantics(
-                            file,
-                            &semantics,
-                            vfs,
-                            library_resolve_paths,
-                            library_mode,
-                        );
+                        extractor.extract_with_semantics(file, &semantics, vfs, library_mode);
                         extractor.archiver.archive(file);
                     }
                 }
@@ -347,7 +318,7 @@ fn main() -> anyhow::Result<()> {
                 extractor.extract_without_semantics(
                     file,
                     SourceKind::Source,
-                    "unable to load manifest",
+                    RustAnalyzerNoSemantics::warning("unable to load manifest"),
                 );
             }
         }
@@ -359,7 +330,7 @@ fn main() -> anyhow::Result<()> {
         let entry = entry.context("failed to read builtins directory")?;
         let path = entry.path();
         if path.extension().is_some_and(|ext| ext == "rs") {
-            extractor.extract_without_semantics(&path, SourceKind::Library, "");
+            extractor.extract_without_semantics(&path, SourceKind::Library, Default::default());
         }
     }
 
diff --git a/rust/extractor/src/rust_analyzer.rs b/rust/extractor/src/rust_analyzer.rs
index d477b13b5d0f..9d3769a24040 100644
--- a/rust/extractor/src/rust_analyzer.rs
+++ b/rust/extractor/src/rust_analyzer.rs
@@ -1,3 +1,4 @@
+use crate::trap;
 use itertools::Itertools;
 use ra_ap_base_db::{EditionedFileId, FileText, RootQueryDb, SourceDatabase};
 use ra_ap_hir::Semantics;
@@ -23,16 +24,47 @@ use std::rc::Rc;
 use tracing::{debug, error, info, trace, warn};
 use triomphe::Arc;
 
+#[derive(Clone, Default)]
+pub struct RustAnalyzerNoSemantics {
+    pub severity: trap::DiagnosticSeverity,
+    pub reason: &'static str,
+}
+
+impl RustAnalyzerNoSemantics {
+    pub fn warning(reason: &'static str) -> Self {
+        RustAnalyzerNoSemantics {
+            severity: trap::DiagnosticSeverity::Warning,
+            reason,
+        }
+    }
+    pub fn info(reason: &'static str) -> Self {
+        RustAnalyzerNoSemantics {
+            severity: trap::DiagnosticSeverity::Info,
+            reason,
+        }
+    }
+}
+
 pub enum RustAnalyzer<'a> {
     WithSemantics {
         vfs: &'a Vfs,
         semantics: &'a Semantics<'a, RootDatabase>,
     },
     WithoutSemantics {
-        reason: &'a str,
+        severity: trap::DiagnosticSeverity,
+        reason: &'static str,
     },
 }
 
+impl From<RustAnalyzerNoSemantics> for RustAnalyzer<'static> {
+    fn from(value: RustAnalyzerNoSemantics) -> Self {
+        RustAnalyzer::WithoutSemantics {
+            severity: value.severity,
+            reason: value.reason,
+        }
+    }
+}
+
 pub struct FileSemanticInformation<'a> {
     pub file_id: EditionedFileId,
     pub semantics: &'a Semantics<'a, RootDatabase>,
@@ -42,7 +74,7 @@ pub struct ParseResult<'a> {
     pub ast: SourceFile,
     pub text: Arc<str>,
     pub errors: Vec<SyntaxError>,
-    pub semantics_info: Result<FileSemanticInformation<'a>, &'a str>,
+    pub semantics_info: Result<FileSemanticInformation<'a>, RustAnalyzerNoSemantics>,
 }
 
 impl<'a> RustAnalyzer<'a> {
@@ -52,7 +84,7 @@ impl<'a> RustAnalyzer<'a> {
         load_config: &LoadCargoConfig,
     ) -> Option<(RootDatabase, Vfs)> {
         let progress = |t| trace!("progress: {t}");
-        let manifest = project.manifest_path();
+        let manifest: &ManifestPath = project.manifest_path();
         match load_workspace_at(manifest.as_ref(), config, load_config, &progress) {
             Ok((db, vfs, _macro_server)) => Some((db, vfs)),
             Err(err) => {
@@ -67,16 +99,25 @@ impl<'a> RustAnalyzer<'a> {
     fn get_file_data(
         &self,
         path: &Path,
-    ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), &str> {
+    ) -> Result<(&Semantics<'_, RootDatabase>, EditionedFileId, FileText), RustAnalyzerNoSemantics>
+    {
         match self {
-            RustAnalyzer::WithoutSemantics { reason } => Err(reason),
+            RustAnalyzer::WithoutSemantics { severity, reason } => Err(RustAnalyzerNoSemantics {
+                severity: *severity,
+                reason,
+            }),
             RustAnalyzer::WithSemantics { vfs, semantics } => {
-                let file_id = path_to_file_id(path, vfs).ok_or("file not found in project")?;
-                let input = std::panic::catch_unwind(|| semantics.db.file_text(file_id))
-                    .or(Err("no text available for the file in the project"))?;
-                let editioned_file_id = semantics
-                    .attach_first_edition(file_id)
-                    .ok_or("failed to determine rust edition")?;
+                let file_id = path_to_file_id(path, vfs).ok_or(
+                    RustAnalyzerNoSemantics::warning("file not found in project"),
+                )?;
+                let input = std::panic::catch_unwind(|| semantics.db.file_text(file_id)).or(
+                    Err(RustAnalyzerNoSemantics::warning(
+                        "no text available for the file in the project",
+                    )),
+                )?;
+                let editioned_file_id = semantics.attach_first_edition(file_id).ok_or(
+                    RustAnalyzerNoSemantics::warning("failed to determine rust edition"),
+                )?;
                 Ok((semantics, editioned_file_id, input))
             }
         }
@@ -95,7 +136,7 @@ impl<'a> RustAnalyzer<'a> {
 
                 ParseResult {
                     ast: source_file,
-                    text: input.text(semantics.db),
+                    text: input.text(semantics.db).clone(),
                     errors,
                     semantics_info: Ok(FileSemanticInformation { file_id, semantics }),
                 }
diff --git a/rust/extractor/src/translate.rs b/rust/extractor/src/translate.rs
index 22bb3f4909f9..1e9f3775d40e 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::{ResolvePaths, SourceKind, Translator};
+pub use base::{SourceKind, Translator};
diff --git a/rust/extractor/src/translate/base.rs b/rust/extractor/src/translate/base.rs
index ccd6143fb84a..ee26da665b27 100644
--- a/rust/extractor/src/translate/base.rs
+++ b/rust/extractor/src/translate/base.rs
@@ -1,22 +1,17 @@
-use super::mappings::{AddressableAst, AddressableHir, Emission, PathAst};
+use super::mappings::Emission;
 use crate::generated::{self};
 use crate::rust_analyzer::FileSemanticInformation;
 use crate::trap::{DiagnosticSeverity, TrapFile, TrapId};
 use crate::trap::{Label, TrapClass};
-use itertools::Either;
-use ra_ap_base_db::{CrateOrigin, EditionedFileId};
+use ra_ap_base_db::EditionedFileId;
+use ra_ap_hir::Semantics;
 use ra_ap_hir::db::ExpandDatabase;
-use ra_ap_hir::{
-    Adt, Crate, ItemContainer, Module, ModuleDef, PathResolution, Semantics, Type, Variant,
-};
-use ra_ap_hir_def::ModuleId;
-use ra_ap_hir_def::type_ref::Mutability;
 use ra_ap_hir_expand::{ExpandResult, ExpandTo, InFile};
 use ra_ap_ide_db::RootDatabase;
 use ra_ap_ide_db::line_index::{LineCol, LineIndex};
 use ra_ap_parser::SyntaxKind;
 use ra_ap_span::TextSize;
-use ra_ap_syntax::ast::{HasAttrs, HasName};
+use ra_ap_syntax::ast::HasAttrs;
 use ra_ap_syntax::{
     AstNode, NodeOrToken, SyntaxElementChildren, SyntaxError, SyntaxNode, SyntaxToken, TextRange,
     ast,
@@ -66,82 +61,24 @@ impl Emission<ast::Meta> for Translator<'_> {
 impl Emission<ast::Fn> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Fn, label: Label<generated::Function>) {
         self.emit_function_has_implementation(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Struct> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Struct, label: Label<generated::Struct>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Enum> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Enum, label: Label<generated::Enum>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
     }
 }
 
 impl Emission<ast::Union> for Translator<'_> {
     fn post_emit(&mut self, node: &ast::Union, label: Label<generated::Union>) {
         self.emit_derive_expansion(node, label);
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Trait> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Trait, label: Label<generated::Trait>) {
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Module> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Module, label: Label<generated::Module>) {
-        self.extract_canonical_origin(node, label.into());
-    }
-}
-
-impl Emission<ast::Variant> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::Variant, label: Label<generated::Variant>) {
-        self.extract_canonical_origin_of_enum_variant(node, label);
-    }
-}
-
-impl Emission<ast::PathExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::PathExpr, label: Label<generated::PathExpr>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::RecordExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::RecordExpr, label: Label<generated::StructExpr>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::PathPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::PathPat, label: Label<generated::PathPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::RecordPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::RecordPat, label: Label<generated::StructPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::TupleStructPat> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::TupleStructPat, label: Label<generated::TupleStructPat>) {
-        self.extract_path_canonical_destination(node, label.into());
-    }
-}
-
-impl Emission<ast::MethodCallExpr> for Translator<'_> {
-    fn post_emit(&mut self, node: &ast::MethodCallExpr, label: Label<generated::MethodCallExpr>) {
-        self.extract_method_canonical_destination(node, label);
     }
 }
 
@@ -175,11 +112,6 @@ macro_rules! dispatch_to_tracing {
     };
 }
 
-#[derive(Copy, Clone, PartialEq, Eq)]
-pub enum ResolvePaths {
-    Yes,
-    No,
-}
 #[derive(Copy, Clone, PartialEq, Eq)]
 pub enum SourceKind {
     Source,
@@ -193,7 +125,6 @@ pub struct Translator<'a> {
     line_index: LineIndex,
     file_id: Option<EditionedFileId>,
     pub semantics: Option<&'a Semantics<'a, RootDatabase>>,
-    resolve_paths: bool,
     source_kind: SourceKind,
     pub(crate) macro_context_depth: usize,
     diagnostic_count: usize,
@@ -211,7 +142,6 @@ impl<'a> Translator<'a> {
         label: Label<generated::File>,
         line_index: LineIndex,
         semantic_info: Option<&FileSemanticInformation<'a>>,
-        resolve_paths: ResolvePaths,
         source_kind: SourceKind,
     ) -> Translator<'a> {
         Translator {
@@ -221,7 +151,6 @@ impl<'a> Translator<'a> {
             line_index,
             file_id: semantic_info.map(|i| i.file_id),
             semantics: semantic_info.map(|i| i.semantics),
-            resolve_paths: resolve_paths == ResolvePaths::Yes,
             source_kind,
             macro_context_depth: 0,
             diagnostic_count: 0,
@@ -514,7 +443,7 @@ impl<'a> Translator<'a> {
                 mcall,
                 &SyntaxError::new(
                     format!(
-                        "macro expansion failed: could not resolve macro '{}'",
+                        "macro expansion failed for '{}'",
                         mcall.path().map(|p| p.to_string()).unwrap_or_default()
                     ),
                     range.unwrap_or_else(|| TextRange::empty(TextSize::from(0))),
@@ -533,254 +462,6 @@ impl<'a> Translator<'a> {
         }
     }
 
-    fn canonical_path_from_type(&self, ty: Type) -> Option<String> {
-        let sema = self.semantics.as_ref().unwrap();
-        // rust-analyzer doesn't provide a type enum directly
-        if let Some(it) = ty.as_adt() {
-            return match it {
-                Adt::Struct(it) => self.canonical_path_from_hir(it),
-                Adt::Union(it) => self.canonical_path_from_hir(it),
-                Adt::Enum(it) => self.canonical_path_from_hir(it),
-            };
-        };
-        if let Some((it, size)) = ty.as_array(sema.db) {
-            return self
-                .canonical_path_from_type(it)
-                .map(|p| format!("[{p}; {size}]"));
-        }
-        if let Some(it) = ty.as_slice() {
-            return self.canonical_path_from_type(it).map(|p| format!("[{p}]"));
-        }
-        if let Some(it) = ty.as_builtin() {
-            return Some(it.name().as_str().to_owned());
-        }
-        if let Some(it) = ty.as_dyn_trait() {
-            return self.canonical_path_from_hir(it).map(|p| format!("dyn {p}"));
-        }
-        if let Some((it, mutability)) = ty.as_reference() {
-            let mut_str = match mutability {
-                Mutability::Shared => "",
-                Mutability::Mut => "mut ",
-            };
-            return self
-                .canonical_path_from_type(it)
-                .map(|p| format!("&{mut_str}{p}"));
-        }
-        if let Some(it) = ty.as_impl_traits(sema.db) {
-            let paths = it
-                .map(|t| self.canonical_path_from_hir(t))
-                .collect::<Option<Vec<_>>>()?;
-            return Some(format!("impl {}", paths.join(" + ")));
-        }
-        if ty.as_type_param(sema.db).is_some() {
-            // from the canonical path perspective, we just want a special name
-            // e.g. `crate::<_ as SomeTrait>::func`
-            return Some("_".to_owned());
-        }
-        None
-    }
-
-    fn canonical_path_from_hir_module(&self, item: Module) -> Option<String> {
-        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());
-        }
-        self.canonical_path_from_hir::<ast::Module>(item)
-    }
-
-    fn canonical_path_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> Option<String> {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        let name = item.name(sema)?;
-        let container = item.container(sema.db);
-        let prefix = match container {
-            ItemContainer::Trait(it) => self.canonical_path_from_hir(it),
-            ItemContainer::Impl(it) => {
-                let ty = self.canonical_path_from_type(it.self_ty(sema.db))?;
-                if let Some(trait_) = it.trait_(sema.db) {
-                    let tr = self.canonical_path_from_hir(trait_)?;
-                    Some(format!("<{ty} as {tr}>"))
-                } else {
-                    Some(format!("<{ty}>"))
-                }
-            }
-            ItemContainer::Module(it) => self.canonical_path_from_hir_module(it),
-            ItemContainer::ExternBlock(..) | ItemContainer::Crate(..) => Some("".to_owned()),
-        }?;
-        Some(format!("{prefix}::{name}"))
-    }
-
-    fn canonical_path_from_module_def(&self, item: ModuleDef) -> Option<String> {
-        match item {
-            ModuleDef::Module(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Function(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Enum(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Struct(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Adt(Adt::Union(it)) => self.canonical_path_from_hir(it),
-            ModuleDef::Trait(it) => self.canonical_path_from_hir(it),
-            ModuleDef::Variant(it) => self.canonical_path_from_enum_variant(it),
-            ModuleDef::Static(_) => None,
-            ModuleDef::TraitAlias(_) => None,
-            ModuleDef::TypeAlias(_) => None,
-            ModuleDef::BuiltinType(_) => None,
-            ModuleDef::Macro(_) => None,
-            ModuleDef::Const(_) => None,
-        }
-    }
-
-    fn canonical_path_from_enum_variant(&self, item: Variant) -> Option<String> {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        let prefix = self.canonical_path_from_hir(item.parent_enum(sema.db))?;
-        let name = item.name(sema.db);
-        Some(format!("{prefix}::{}", name.as_str()))
-    }
-
-    fn origin_from_hir<T: AstNode>(&self, item: impl AddressableHir<T>) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        self.origin_from_crate(item.module(sema).krate())
-    }
-
-    fn origin_from_crate(&self, item: Crate) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        match item.origin(sema.db) {
-            CrateOrigin::Rustc { name } => format!("rustc:{name}"),
-            CrateOrigin::Local { repo, name } => format!(
-                "repo:{}:{}",
-                repo.unwrap_or_default(),
-                name.map(|s| s.as_str().to_owned()).unwrap_or_default()
-            ),
-            CrateOrigin::Library { repo, name } => {
-                format!("repo:{}:{}", repo.unwrap_or_default(), name)
-            }
-            CrateOrigin::Lang(it) => format!("lang:{it}"),
-        }
-    }
-
-    fn origin_from_module_def(&self, item: ModuleDef) -> Option<String> {
-        match item {
-            ModuleDef::Module(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Function(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Enum(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Struct(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Adt(Adt::Union(it)) => Some(self.origin_from_hir(it)),
-            ModuleDef::Trait(it) => Some(self.origin_from_hir(it)),
-            ModuleDef::Variant(it) => Some(self.origin_from_enum_variant(it)),
-            ModuleDef::Static(_) => None,
-            ModuleDef::TraitAlias(_) => None,
-            ModuleDef::TypeAlias(_) => None,
-            ModuleDef::BuiltinType(_) => None,
-            ModuleDef::Macro(_) => None,
-            ModuleDef::Const(_) => None,
-        }
-    }
-
-    fn origin_from_enum_variant(&self, item: Variant) -> String {
-        // if we have a Hir entity, it means we have semantics
-        let sema = self.semantics.as_ref().unwrap();
-        self.origin_from_hir(item.parent_enum(sema.db))
-    }
-
-    pub(crate) fn extract_canonical_origin<T: AddressableAst + HasName>(
-        &mut self,
-        item: &T,
-        label: Label<generated::Addressable>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let def = T::Hir::try_from_source(item, sema)?;
-            let path = self.canonical_path_from_hir(def)?;
-            let origin = self.origin_from_hir(def);
-            generated::Addressable::emit_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Addressable::emit_extended_canonical_path(
-                label,
-                path,
-                &mut self.trap.writer,
-            );
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_canonical_origin_of_enum_variant(
-        &mut self,
-        item: &ast::Variant,
-        label: Label<generated::Variant>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let def = sema.to_enum_variant_def(item)?;
-            let path = self.canonical_path_from_enum_variant(def)?;
-            let origin = self.origin_from_enum_variant(def);
-            generated::Addressable::emit_crate_origin(label.into(), origin, &mut self.trap.writer);
-            generated::Addressable::emit_extended_canonical_path(
-                label.into(),
-                path,
-                &mut self.trap.writer,
-            );
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_path_canonical_destination(
-        &mut self,
-        item: &impl PathAst,
-        label: Label<generated::Resolvable>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let path = item.path()?;
-            let sema = self.semantics.as_ref()?;
-            let resolution = sema.resolve_path(&path)?;
-            let PathResolution::Def(def) = resolution else {
-                return None;
-            };
-            let origin = self.origin_from_module_def(def)?;
-            let path = self.canonical_path_from_module_def(def)?;
-            generated::Resolvable::emit_resolved_crate_origin(label, origin, &mut self.trap.writer);
-            generated::Resolvable::emit_resolved_path(label, path, &mut self.trap.writer);
-            Some(())
-        })();
-    }
-
-    pub(crate) fn extract_method_canonical_destination(
-        &mut self,
-        item: &ast::MethodCallExpr,
-        label: Label<generated::MethodCallExpr>,
-    ) {
-        if !self.resolve_paths {
-            return;
-        }
-        (|| {
-            let sema = self.semantics.as_ref()?;
-            let resolved = sema.resolve_method_call_fallback(item)?;
-            let (Either::Left(function), _) = resolved else {
-                return None;
-            };
-            let origin = self.origin_from_hir(function);
-            let path = self.canonical_path_from_hir(function)?;
-            generated::Resolvable::emit_resolved_crate_origin(
-                label.into(),
-                origin,
-                &mut self.trap.writer,
-            );
-            generated::Resolvable::emit_resolved_path(label.into(), path, &mut self.trap.writer);
-            Some(())
-        })();
-    }
-
     pub(crate) fn should_be_excluded(&self, item: &impl ast::HasAttrs) -> bool {
         self.semantics.is_some_and(|sema| {
             item.attrs().any(|attr| {
@@ -834,6 +515,38 @@ impl<'a> Translator<'a> {
         }
     }
 
+    pub(crate) fn emit_macro_stmts(
+        &mut self,
+        node: &ast::MacroStmts,
+    ) -> Option<Label<generated::MacroBlockExpr>> {
+        // not generated to work around a bug in rust-analyzer AST generation machinery.
+        // Because an Expr can also be a Stmt (AsmExpr: Expr and AsmExpr: Item: Stmt)
+        // then such an element will be returned by both `expr()` and `statements()`
+        let mut statements = node.statements().collect::<Vec<_>>();
+        let tail_expr = node.expr();
+        if tail_expr
+            .as_ref()
+            .is_some_and(|e| statements.last().is_some_and(|s| s.syntax() == e.syntax()))
+        {
+            // if the expression matched as both the tail_expr and the last of the statements,
+            // only take it as tail_expr
+            statements.pop();
+        }
+        let tail_expr = tail_expr.and_then(|e| self.emit_expr(&e));
+        let statements = statements
+            .iter()
+            .filter_map(|x| self.emit_stmt(x))
+            .collect();
+        let label = self.trap.emit(generated::MacroBlockExpr {
+            id: TrapId::Star,
+            tail_expr,
+            statements,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
+
     fn is_attribute_macro_target(&self, node: &ast::Item) -> bool {
         // rust-analyzer considers as an `attr_macro_call` also a plain macro call, but we want to
         // process that differently (in `extract_macro_call_expanded`)
diff --git a/rust/extractor/src/translate/generated.rs b/rust/extractor/src/translate/generated.rs
index 787ce71bf2a8..607d6e195fa7 100644
--- a/rust/extractor/src/translate/generated.rs
+++ b/rust/extractor/src/translate/generated.rs
@@ -212,6 +212,7 @@ impl Translator<'_> {
             return Some(label);
         }
         let label = match node {
+            ast::Item::AsmExpr(inner) => self.emit_asm_expr(inner).map(Into::into),
             ast::Item::Const(inner) => self.emit_const(inner).map(Into::into),
             ast::Item::Enum(inner) => self.emit_enum(inner).map(Into::into),
             ast::Item::ExternBlock(inner) => self.emit_extern_block(inner).map(Into::into),
@@ -687,21 +688,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_closure_binder(
-        &mut self,
-        node: &ast::ClosureBinder,
-    ) -> Option<Label<generated::ClosureBinder>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
-        let label = self.trap.emit(generated::ClosureBinder {
-            id: TrapId::Star,
-            generic_param_list,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_closure_expr(
         &mut self,
         node: &ast::ClosureExpr,
@@ -711,9 +697,7 @@ impl Translator<'_> {
         }
         let attrs = node.attrs().filter_map(|x| self.emit_attr(&x)).collect();
         let body = node.body().and_then(|x| self.emit_expr(&x));
-        let closure_binder = node
-            .closure_binder()
-            .and_then(|x| self.emit_closure_binder(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let is_gen = node.gen_token().is_some();
@@ -725,7 +709,7 @@ impl Translator<'_> {
             id: TrapId::Star,
             attrs,
             body,
-            closure_binder,
+            for_binder,
             is_async,
             is_const,
             is_gen,
@@ -1063,6 +1047,21 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
+    pub(crate) fn emit_for_binder(
+        &mut self,
+        node: &ast::ForBinder,
+    ) -> Option<Label<generated::ForBinder>> {
+        let generic_param_list = node
+            .generic_param_list()
+            .and_then(|x| self.emit_generic_param_list(&x));
+        let label = self.trap.emit(generated::ForBinder {
+            id: TrapId::Star,
+            generic_param_list,
+        });
+        self.emit_location(label, node);
+        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
+        Some(label)
+    }
     pub(crate) fn emit_for_expr(
         &mut self,
         node: &ast::ForExpr,
@@ -1091,13 +1090,11 @@ impl Translator<'_> {
         &mut self,
         node: &ast::ForType,
     ) -> Option<Label<generated::ForTypeRepr>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let label = self.trap.emit(generated::ForTypeRepr {
             id: TrapId::Star,
-            generic_param_list,
+            for_binder,
             type_repr,
         });
         self.emit_location(label, node);
@@ -1603,24 +1600,6 @@ impl Translator<'_> {
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
-    pub(crate) fn emit_macro_stmts(
-        &mut self,
-        node: &ast::MacroStmts,
-    ) -> Option<Label<generated::MacroBlockExpr>> {
-        let tail_expr = node.expr().and_then(|x| self.emit_expr(&x));
-        let statements = node
-            .statements()
-            .filter_map(|x| self.emit_stmt(&x))
-            .collect();
-        let label = self.trap.emit(generated::MacroBlockExpr {
-            id: TrapId::Star,
-            tail_expr,
-            statements,
-        });
-        self.emit_location(label, node);
-        self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
-        Some(label)
-    }
     pub(crate) fn emit_macro_type(
         &mut self,
         node: &ast::MacroType,
@@ -1736,9 +1715,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::MethodCallExpr,
     ) -> Option<Label<generated::MethodCallExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1758,14 +1734,10 @@ impl Translator<'_> {
             receiver,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
     pub(crate) fn emit_module(&mut self, node: &ast::Module) -> Option<Label<generated::Module>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1781,7 +1753,6 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -1964,9 +1935,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::PathExpr,
     ) -> Option<Label<generated::PathExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -1978,7 +1946,6 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -1986,16 +1953,12 @@ impl Translator<'_> {
         &mut self,
         node: &ast::PathPat,
     ) -> Option<Label<generated::PathPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::PathPat {
             id: TrapId::Star,
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2123,9 +2086,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::RecordExpr,
     ) -> Option<Label<generated::StructExpr>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_expr_field_list = node
             .record_expr_field_list()
@@ -2136,7 +2096,6 @@ impl Translator<'_> {
             struct_expr_field_list,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2229,9 +2188,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::RecordPat,
     ) -> Option<Label<generated::StructPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let path = node.path().and_then(|x| self.emit_path(&x));
         let struct_pat_field_list = node
             .record_pat_field_list()
@@ -2242,7 +2198,6 @@ impl Translator<'_> {
             struct_pat_field_list,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2568,9 +2523,6 @@ impl Translator<'_> {
         Some(label)
     }
     pub(crate) fn emit_trait(&mut self, node: &ast::Trait) -> Option<Label<generated::Trait>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -2602,7 +2554,6 @@ impl Translator<'_> {
             where_clause,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2725,9 +2676,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::TupleStructPat,
     ) -> Option<Label<generated::TupleStructPat>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         let fields = node.fields().filter_map(|x| self.emit_pat(&x)).collect();
         let path = node.path().and_then(|x| self.emit_path(&x));
         let label = self.trap.emit(generated::TupleStructPat {
@@ -2736,7 +2684,6 @@ impl Translator<'_> {
             path,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -2804,6 +2751,7 @@ impl Translator<'_> {
         &mut self,
         node: &ast::TypeBound,
     ) -> Option<Label<generated::TypeBound>> {
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let is_async = node.async_token().is_some();
         let is_const = node.const_token().is_some();
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
@@ -2813,6 +2761,7 @@ impl Translator<'_> {
             .and_then(|x| self.emit_use_bound_generic_args(&x));
         let label = self.trap.emit(generated::TypeBound {
             id: TrapId::Star,
+            for_binder,
             is_async,
             is_const,
             lifetime,
@@ -2984,9 +2933,6 @@ impl Translator<'_> {
         &mut self,
         node: &ast::Variant,
     ) -> Option<Label<generated::Variant>> {
-        if let Some(label) = self.pre_emit(node) {
-            return Some(label);
-        }
         if self.should_be_excluded(node) {
             return None;
         }
@@ -3004,7 +2950,6 @@ impl Translator<'_> {
             visibility,
         });
         self.emit_location(label, node);
-        self.post_emit(node, label);
         self.emit_tokens(node, label.into(), node.syntax().children_with_tokens());
         Some(label)
     }
@@ -3057,9 +3002,7 @@ impl Translator<'_> {
         &mut self,
         node: &ast::WherePred,
     ) -> Option<Label<generated::WherePred>> {
-        let generic_param_list = node
-            .generic_param_list()
-            .and_then(|x| self.emit_generic_param_list(&x));
+        let for_binder = node.for_binder().and_then(|x| self.emit_for_binder(&x));
         let lifetime = node.lifetime().and_then(|x| self.emit_lifetime(&x));
         let type_repr = node.ty().and_then(|x| self.emit_type(&x));
         let type_bound_list = node
@@ -3067,7 +3010,7 @@ impl Translator<'_> {
             .and_then(|x| self.emit_type_bound_list(&x));
         let label = self.trap.emit(generated::WherePred {
             id: TrapId::Star,
-            generic_param_list,
+            for_binder,
             lifetime,
             type_repr,
             type_bound_list,
@@ -3168,39 +3111,12 @@ impl HasTrapClass for ast::MacroCall {
 impl HasTrapClass for ast::Meta {
     type TrapClass = generated::Meta;
 }
-impl HasTrapClass for ast::MethodCallExpr {
-    type TrapClass = generated::MethodCallExpr;
-}
-impl HasTrapClass for ast::Module {
-    type TrapClass = generated::Module;
-}
-impl HasTrapClass for ast::PathExpr {
-    type TrapClass = generated::PathExpr;
-}
-impl HasTrapClass for ast::PathPat {
-    type TrapClass = generated::PathPat;
-}
 impl HasTrapClass for ast::PathSegment {
     type TrapClass = generated::PathSegment;
 }
-impl HasTrapClass for ast::RecordExpr {
-    type TrapClass = generated::StructExpr;
-}
-impl HasTrapClass for ast::RecordPat {
-    type TrapClass = generated::StructPat;
-}
 impl HasTrapClass for ast::Struct {
     type TrapClass = generated::Struct;
 }
-impl HasTrapClass for ast::Trait {
-    type TrapClass = generated::Trait;
-}
-impl HasTrapClass for ast::TupleStructPat {
-    type TrapClass = generated::TupleStructPat;
-}
 impl HasTrapClass for ast::Union {
     type TrapClass = generated::Union;
 }
-impl HasTrapClass for ast::Variant {
-    type TrapClass = generated::Variant;
-}
diff --git a/rust/extractor/src/translate/mappings.rs b/rust/extractor/src/translate/mappings.rs
index 3e71c6deb14a..f1a42dbf2457 100644
--- a/rust/extractor/src/translate/mappings.rs
+++ b/rust/extractor/src/translate/mappings.rs
@@ -1,6 +1,4 @@
 use crate::trap::{Label, TrapClass};
-use ra_ap_hir::{Enum, Function, HasContainer, Module, Semantics, Struct, Trait, Union};
-use ra_ap_ide_db::RootDatabase;
 use ra_ap_syntax::{AstNode, ast, ast::RangeItem};
 
 pub(crate) trait HasTrapClass: AstNode {
@@ -65,155 +63,3 @@ impl TextValue for ast::RangePat {
         self.op_token().map(|x| x.text().to_string())
     }
 }
-
-pub(crate) trait AddressableHir<Ast: AstNode>: HasContainer + Copy {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String>;
-    fn try_from_source(value: &Ast, sema: &Semantics<'_, RootDatabase>) -> Option<Self>;
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module;
-}
-
-impl AddressableHir<ast::Fn> for Function {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Fn, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_fn_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Trait> for Trait {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Trait, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_trait_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Module> for Module {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        self.name(sema.db).map(|s| s.as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Module, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_module_def(value)
-    }
-
-    fn module(self, _sema: &Semantics<'_, RootDatabase>) -> Module {
-        self
-    }
-}
-
-impl AddressableHir<ast::Struct> for Struct {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Struct, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_struct_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Enum> for Enum {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Enum, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_enum_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-impl AddressableHir<ast::Union> for Union {
-    fn name(self, sema: &Semantics<'_, RootDatabase>) -> Option<String> {
-        Some(self.name(sema.db).as_str().to_owned())
-    }
-
-    fn try_from_source(value: &ast::Union, sema: &Semantics<'_, RootDatabase>) -> Option<Self> {
-        sema.to_union_def(value)
-    }
-
-    fn module(self, sema: &Semantics<'_, RootDatabase>) -> Module {
-        self.module(sema.db)
-    }
-}
-
-pub(crate) trait AddressableAst: AstNode + Sized {
-    type Hir: AddressableHir<Self>;
-}
-
-impl AddressableAst for ast::Fn {
-    type Hir = Function;
-}
-
-impl AddressableAst for ast::Trait {
-    type Hir = Trait;
-}
-
-impl AddressableAst for ast::Struct {
-    type Hir = Struct;
-}
-
-impl AddressableAst for ast::Enum {
-    type Hir = Enum;
-}
-
-impl AddressableAst for ast::Union {
-    type Hir = Union;
-}
-
-impl AddressableAst for ast::Module {
-    type Hir = Module;
-}
-
-pub trait PathAst: AstNode {
-    fn path(&self) -> Option<ast::Path>;
-}
-
-impl PathAst for ast::PathExpr {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::RecordExpr {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::PathPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::RecordPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
-
-impl PathAst for ast::TupleStructPat {
-    fn path(&self) -> Option<ast::Path> {
-        self.path()
-    }
-}
diff --git a/rust/extractor/src/trap.rs b/rust/extractor/src/trap.rs
index 3a6dbeb24e11..31e9f2122d70 100644
--- a/rust/extractor/src/trap.rs
+++ b/rust/extractor/src/trap.rs
@@ -127,9 +127,10 @@ pub struct TrapFile {
     compression: Compression,
 }
 
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
+#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default)]
 pub enum DiagnosticSeverity {
     Debug = 10,
+    #[default]
     Info = 20,
     Warning = 30,
     Error = 40,
diff --git a/rust/ql/.generated.list b/rust/ql/.generated.list
index cac9970eeecf..23a5b4fabf05 100644
--- a/rust/ql/.generated.list
+++ b/rust/ql/.generated.list
@@ -1,4 +1,4 @@
-lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 6a103a6d04c951ca2f0c2989bed737cdbac56dd5ea9432b858da3416412bbf79 cf2bc67b65a1555de58bbd0a35b834b8867112a2f7c1951307c9416400ce70d0
+lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll 11c7521ec2231a4d0447f30fc3d0bb14aebb659bd8cf75935af1050673a3b1d6 d0a77b572a032e43f1c47622315c0cdfe17e68c2b057534b9322fc528029fb40
 lib/codeql/rust/elements/Abi.qll 485a2e79f6f7bfd1c02a6e795a71e62dede3c3e150149d5f8f18b761253b7208 6159ba175e7ead0dd2e3f2788f49516c306ee11b1a443bd4bdc00b7017d559bd
 lib/codeql/rust/elements/Addressable.qll 13011bfd2e1556694c3d440cc34af8527da4df49ad92b62f2939d3699ff2cea5 ddb25935f7553a1a384b1abe2e4b4fa90ab50b952dadec32fd867afcb054f4be
 lib/codeql/rust/elements/Adt.qll c2afed4ac2e17039ccd98f74ea22111f4d765c4e232c50ccd3128da0d26da837 1380bde2eb667c6ec2ef5f8710aa24e926851c9e321ebc72ba514fa92c369dc3
@@ -10,7 +10,7 @@ lib/codeql/rust/elements/ArrayTypeRepr.qll a3e61c99567893aa26c610165696e54d11c16
 lib/codeql/rust/elements/AsmClobberAbi.qll eb5628916f41ab47e333b4528fba3fb80caecd2805fb20ba4f5c8d59c9677f14 636fce6b3a7f04141d0d3a53734d08a188a45bcc04f755bb66746d4f0a13fa72
 lib/codeql/rust/elements/AsmConst.qll f408468624dd0c80c6dcf62d17e65a94cd477a5a760be1b5fdd07c8189a3b4ea e4159073b3ee6d247e8962ce925da55ea39ee2cd1649f8b785a92aea17dbf144
 lib/codeql/rust/elements/AsmDirSpec.qll 0c439c031c9f60596373aee8ae2ee70068582548ae365a3c7c19c8b5e2b030d2 0127b08b99bd8725cb6273c1a930aef4434897f23611cfc4ec2dd1b7c9d7e3d0
-lib/codeql/rust/elements/AsmExpr.qll 33a9a873ba05235dd80103ed22555eee220a4c0cb86605d0f76bcda316605449 c8a99b7bd55aac41e56d05cd5a52692f1d835ed3e1a1bd029bb41d8e2b81b240
+lib/codeql/rust/elements/AsmExpr.qll 0a477c401583a778ea6736070eaf8959f9312135e863e45fafb6c160da2e8f1b 0447b2438c694f9e9bd2629abb66281724d27b17e534fa8e9a19b2ea30af18d2
 lib/codeql/rust/elements/AsmLabel.qll 5fa3401c49329ddc845bd95d5f498a455202f685e962dfec9bc91550577da800 f54fe1dcd3c76f36e6abc7b56dc5d6f5b1c30d0fb434db21dd8a1ce731fc6abf
 lib/codeql/rust/elements/AsmOperand.qll 3987a289233fe09f41f20b27939655cc72fa46847969a55cca6d6393f906969a 8810ff2a64f29d1441a449f5fd74bdc1107782172c7a21baaeb48a40930b7d5a
 lib/codeql/rust/elements/AsmOperandExpr.qll 72d4455cf742dc977b0a33ea21539422aaf2263f36c6f4420ddcb360ac606a0a 03bd01e81b291c915deb20ce33d5bdf73a709fbc007ab7570490e9a8e7c8604c
@@ -36,8 +36,7 @@ lib/codeql/rust/elements/CallExpr.qll f336500ca7a611b164d48b90e80edb0c0d3816792b
 lib/codeql/rust/elements/CallExprBase.qll 2846202b5208b541977500286951d96487bf555838c6c16cdd006a71e383745a c789d412bf099c624329379e0c7d94fa0d23ae2edea7a25a2ea0f3c0042ccf62
 lib/codeql/rust/elements/Callable.qll 0f7f78c3bfabbe24962f6232b0440d27e51f06d2b8d341fc623ffbfbff173f47 5fd13aaa0eaf76ea0b47fa0641bd23eea20a069f0b3cbc1ee4e290e88321008a
 lib/codeql/rust/elements/CastExpr.qll 2fe1f36ba31fa29de309baf0a665cfcae67b61c73345e8f9bbd41e8c235fec45 c5b4c1e9dc24eb2357799defcb2df25989075e3a80e8663b74204a1c1b70e29a
-lib/codeql/rust/elements/ClosureBinder.qll 02c8e83bf07deaf7bf0233b76623ec7f1837be8b77fe7e1c23544edc7d85e3c4 2b114d9a6dede694324aebe3dac80a802d139cfacd39beb0f12b5b0a46ee6390
-lib/codeql/rust/elements/ClosureExpr.qll 67e2a106e9154c90367b129987e574d2a9ecf5b297536627e43706675d35eaed d6a381132ddd589c5a7ce174f50f9620041ddf690e15a65ebfb05ff7e7c02de7
+lib/codeql/rust/elements/ClosureExpr.qll 69e0b7a7c7a4c348fcada5ad4da22dd2f51747109f856be239cede315a56d695 93400650282e2d4e682b826e9f5f844aa893dda126548e41ea1c703d2bf209ca
 lib/codeql/rust/elements/Comment.qll fedad50575125e9a64a8a8776a8c1dbf1e76df990f01849d9f0955f9d74cb2a6 8eb1afad1e1007a4f0090fdac65d81726b23eda6517d067fd0185f70f17635ab
 lib/codeql/rust/elements/Const.qll 5f4d11e01162a06127ba56519efd66d1ecfb5de7c1792fc1c283a56cf2127373 8c618ac774267d25db70cc05a080f8a408dc23ab7e88c0fc543eda8b4d4cb995
 lib/codeql/rust/elements/ConstArg.qll 01865b3be4790c627a062c59ea608462931abcb2f94a132cf265318664fd1251 a2c6bbf63dbfa999e511b6941143a51c9392477d8ccd25e081f85475936ff558
@@ -57,8 +56,9 @@ lib/codeql/rust/elements/ExternItemList.qll eceb0fcd3a6f9d87fa044da1da112ce96b75
 lib/codeql/rust/elements/FieldExpr.qll 8102cd659f9059cf6af2a22033cfcd2aae9c35204b86f7d219a05f1f8de54b3b f818169dddf5102095ae1410583615f80031376a08b5307d0c464e79953c3975
 lib/codeql/rust/elements/FieldList.qll 72f3eace2f0c0600b1ad059819ae756f1feccd15562e0449a3f039a680365462 50e4c01df7b801613688b06bb47ccc36e6c8c7fa2e50cc62cb4705c9abf5ee31
 lib/codeql/rust/elements/FnPtrTypeRepr.qll d4586ac5ee2382b5ef9daafa77c7b3c1b7564647aa20d1efb1626299cde87ba9 48d9b63725c9cd89d79f9806fa5d5f22d7815e70bbd78d8da40a2359ac53fef5
+lib/codeql/rust/elements/ForBinder.qll ee29b55cb4c1fa5180cc4ee1236ac089fe9f67ffa9e5a1474003b717f1ac6e0f 5b811c8cf9550cb675034315e03c5cbbfa7544ad3a696988e04d780037d434bf
 lib/codeql/rust/elements/ForExpr.qll a050f60cf6fcc3ce66f5042be1b8096e5207fe2674d7477f9e299091ca99a4bd d7198495139649778894e930163add2d16b5588dd12bd6e094a9aec6863cb16f
-lib/codeql/rust/elements/ForTypeRepr.qll b3ba3a7f74f092397f7986542e59020bd7ea63eb8abc154d0f66f1415e1eaf6e a04750567cf85e11698a6b93674a651245537d08bf8aabf303a3626e190a4977
+lib/codeql/rust/elements/ForTypeRepr.qll c85c5e368b9db4a308b55259b3e6b1f4d37050984de43b24971243d6ca6dcec5 51b1c3ddac2fb9616ec44816bcbb549df2c15bbbe674d045a7b1c352c1e335e3
 lib/codeql/rust/elements/Format.qll 1b186730710e7e29ea47594998f0b359ad308927f84841adae0c0cb35fc8aeda d6f7bfdda60a529fb9e9a1975628d5bd11aa28a45e295c7526692ac662fd19f8
 lib/codeql/rust/elements/FormatArgsArg.qll a2c23cd512d44dd60b7d65eba52cc3adf6e2fbbcd0588be375daa16002cd7741 d9c5fe183fb228375223d83f857b7a9ee686f1d3e341bcf323d7c6f39652f88b
 lib/codeql/rust/elements/FormatArgsExpr.qll 8127cbe4082f7acc3d8a05298c2c9bea302519b8a6cd2d158a83c516d18fc487 88cf9b3bedd69a1150968f9a465c904bbb6805da0e0b90cfd1fc0dab1f6d9319
@@ -90,7 +90,7 @@ lib/codeql/rust/elements/LiteralPat.qll daffb5f380a47543669c8cc92628b0e0de478c3a
 lib/codeql/rust/elements/Locatable.qll 2855efa4a469b54e0ca85daa89309a8b991cded6f3f10db361010831ba1e11d3 00c3406d14603f90abea11bf074eaf2c0b623a30e29cf6afc3a247cb58b92f0f
 lib/codeql/rust/elements/LoopExpr.qll ee171177650fa23eef102a9580765f4b6073a1cc41bab1ec31ad4f84ffe6c2c9 bfcf0cca4dc944270d9748a202829a38c64dfae167c0d3a4202788ceb9daf5f6
 lib/codeql/rust/elements/LoopingExpr.qll 7ad7d4bbfd05adc0bb9b4ca90ff3377b8298121ca5360ffb45d5a7a1e20fe37a 964168b2045ee9bad827bba53f10a64d649b3513f2d1e3c17a1b1f11d0fc7f3a
-lib/codeql/rust/elements/MacroBlockExpr.qll fb81f067a142053b122e2875a15719565024cfb09326faf12e0f1017307deb58 3ee94ef7e56bd07a8f9304869b0a7b69971b02abbee46d0bebcacb4031760282
+lib/codeql/rust/elements/MacroBlockExpr.qll 077c968da099c10456be4b594675a074e9a4e43b5c5145e1b1ae1fa47ae6d570 99586e3766ee0c80364998128e067cab2639ac25c1dcbe13e0247d629490af6f
 lib/codeql/rust/elements/MacroCall.qll 452aee152b655cdd5a69bf973977072f000a6451f626469a3f7313f0468ffc18 a8652d0de1c6c2118d683d5465ba4115dd4c65031896440269a2a0522d90fceb
 lib/codeql/rust/elements/MacroDef.qll 5bcf2bba7ba40879fe47370bfeb65b23c67c463be20535327467338a1e2e04bb c3d28416fc08e5d79149fccd388fea2bc3097bce074468a323383056404926db
 lib/codeql/rust/elements/MacroExpr.qll 640554f4964def19936a16ce88a03fb12f74ec2bcfe38b88d32742b79f85d909 a284fb66e012664a33a4e9c8fd3e38d3ffd588fccd6b16b02270da55fc025f7a
@@ -103,7 +103,7 @@ lib/codeql/rust/elements/MatchArmList.qll f221c5e344814fa44db06ab897afdc249e8e88
 lib/codeql/rust/elements/MatchExpr.qll e9ef1664f020823b6f4bb72d906a9dc0c1ee6432d4a9a13f7dbdbab2b2b1ee4d 38d71e5c487abcb5682293c573343be66e499a6e131bb630604c120d34b7777b
 lib/codeql/rust/elements/MatchGuard.qll 58256689a90f24b16401543452c2a32f00d619ddac6c0fe8b65a8cd3e46401bb 8efb2ac03c69a9db687e382331085d7a6cfbf8eca559174ba2727a9549ec7ddd
 lib/codeql/rust/elements/Meta.qll b17d7bf605bd0cf4f6d6c6cf4f39a16cfc431d256d45b93663a7569181d36168 815cdfef06231de4b4b1c85e321b8ccb3e22379e5a4e111df9cc9ca6be593841
-lib/codeql/rust/elements/MethodCallExpr.qll 318a46ba61e3e4f0d6ce0e8fa9f79ccbbf2d0f3d0638e6813e1bcb44d624715a 35e03ed4beddd75834fcfc4371bd65eaf099053aa23f7f1d1e6bea2e5825aa6e
+lib/codeql/rust/elements/MethodCallExpr.qll 91b411e0fb1a0547dcad8726db460dccc61bed972741598d5cb3740593fe75a7 538d23b6db115bb699389d29a1829bb0449c08424a1fff80377828eb7ceb2563
 lib/codeql/rust/elements/Missing.qll 70e6ac9790314752849c9888443c98223ccfc93a193998b7ce350b2c6ebe8ea4 e2f0623511acaa76b091f748d417714137a8b94f1f2bdbbd177f1c682c786dad
 lib/codeql/rust/elements/Module.qll 0bc85019177709256f8078d9de2a36f62f848d476225bff7bba1e35f249875c7 3fbb70e0c417a644dd0cada2c364c6e6876cfa16f37960e219c87e49c966c94e
 lib/codeql/rust/elements/Name.qll af41479d4260fe931d46154dda15484e4733c952b98f0e370106e6e9e8ce398b e188a0d0309dd1b684c0cb88df435b38e306eb94d6b66a2b748e75252f15e095
@@ -120,7 +120,7 @@ lib/codeql/rust/elements/ParenTypeRepr.qll 2388b6c663b2d02c834592c5da5cafac71baa
 lib/codeql/rust/elements/ParenthesizedArgList.qll aa3be48d2f8b5cec56db3866fb7d4e0cd97787e9123e2d947912eb8155bf372b 32790971728c9ae2f3d59155d46283aaf4f08238e47bb028a1f20a6d3a734b98
 lib/codeql/rust/elements/Pat.qll 56211c5cb4709e7c12a2bfd2da5e413a451672d99e23a8386c08ad0b999fd45c b1b1893a13a75c4f0390f7e2a14ee98a46f067cfdc991a8d43adc82497d20aff
 lib/codeql/rust/elements/Path.qll 16264a9c978a3027f623530e386a9ad16541305b252fed5e1bedcfbe1d6475d5 8c21063c7f344ce686342e7c12542fec05004e364681f7a31b65f5ee9263a46d
-lib/codeql/rust/elements/PathAstNode.qll c5c8627caaf863089d4d6004e206b2e62bc466db2ed5da9f3f443bf3dc29faf9 01107b1ce17cbee08a764962fb13d3f02edbd10675fa5bd89e089f03075ba443
+lib/codeql/rust/elements/PathAstNode.qll 68160b08272ecde0e636779b7c547f808356d69d1150863b37188ea84e110cab cafa2de0bf3be978854319bbcf5ad1591acd64abd7b0958ff14c96a7529fcc99
 lib/codeql/rust/elements/PathExpr.qll 0232228845a2005fc63d6b8aea8b49ff50415e0e90fd18f863ee1d6e44f53c07 47b15cc6ae576d13f14b29ffa4620451accc603ff87071dfe48660dbe018bf36
 lib/codeql/rust/elements/PathExprBase.qll bb41092ec690ae926e3233c215dcaf1fd8e161b8a6955151949f492e02dba13a b2257072f8062d31c29c63ee1311b07e0d2eb37075f582cfc76bb542ef773198
 lib/codeql/rust/elements/PathPat.qll a7069d1dd77ba66814d6c84e135ed2975d7fcf379624079e6a76dc44b5de832e 2294d524b65ab0d038094b2a00f73feb8ab70c8f49fb4d91e9d390073205631d
@@ -134,7 +134,6 @@ lib/codeql/rust/elements/RefExpr.qll 91a0d3a86002289dc01ffbe8daca13e34e92e522fbb
 lib/codeql/rust/elements/RefPat.qll fe076bdccb454111b38f360837d180274ba8a003b4cffe910b5197cd74188089 2604c8bb2b0b47091d5fc4aa276de46fe3561e346bd98f291c3783cef402ba06
 lib/codeql/rust/elements/RefTypeRepr.qll 563d2edc097aa1896b3dea5a3918e6225f23dda91b3fb46e2f4c32feb813d56c af3bd746239130e3e94dd41ab682473b29b8b900b05c557beb8a2eba6508ebd9
 lib/codeql/rust/elements/Rename.qll 5cb0ebad580d9842cfe65033059d4d373a1386f047f3a78f402a93e060e2c13e 642c6f37d94442575df12b2e998572a725d094ac5ae76147a56057e75138d72b
-lib/codeql/rust/elements/Resolvable.qll efeec2b4b14d85334ec745b9a0c5aa6f7b9f86fe3caa45b005dccaee4f5265c4 7efe0063340ba61dd31125bc770773ca23a7067893c0d1e06d149da6e9a9ee92
 lib/codeql/rust/elements/RestPat.qll 5fedfac18080b068f597c9bbb84de672834f72cc22295d6312e111f151f8e3c7 c0e1f77bfcdd40e8ab06ad8c138e6098d79940247758adf9de03a05b00c23de3
 lib/codeql/rust/elements/RetTypeRepr.qll a603393d373f38831dded00878c3299d61fdb977723d3e1038692f7a46bfebc5 583c626f7ae7fb4ec9a9f93f072330c16560ab52c8dfec566c46af40fb9f39f8
 lib/codeql/rust/elements/ReturnExpr.qll b87187cff55bc33c8c18558c9b88617179183d1341b322c1cab35ba07167bbdb 892f3a9df2187e745c869e67f33c228ee42754bc9e4f8f4c1718472eb8f8c80f
@@ -147,7 +146,7 @@ lib/codeql/rust/elements/Static.qll 9dca6d4fb80fb4ead49a3de89bec2b02bae6f96fbc26
 lib/codeql/rust/elements/Stmt.qll 532b12973037301246daf7d8c0177f734202f43d9261c7a4ca6f5080eea8ca64 b838643c4f2b4623d2c816cddad0e68ca3e11f2879ab7beaece46f489ec4b1f3
 lib/codeql/rust/elements/StmtList.qll e874859ce03672d0085e47e0ca5e571b92b539b31bf0d5a8802f9727bef0c6b0 e5fe83237f713cdb57c446a6e1c20f645c2f49d9f5ef2c984032df83acb3c0de
 lib/codeql/rust/elements/Struct.qll 297d3ea732fc7fbb8b8fb5479c1873ce84705146853ff752c84a6f70af12b923 3df0e5fd50a910a0b5611c3a860a1d7c318f6925c3a0727006d91840caf04812
-lib/codeql/rust/elements/StructExpr.qll af9059c01a97755e94f1a8b60c66d9c7663ed0705b2845b086b8953f16019fab 2d33d86b035a15c1b31c3e07e0e74c4bbe57a71c5a55d60e720827814e73b7ba
+lib/codeql/rust/elements/StructExpr.qll 84f384ef74c723796e514186037a91dd9666556f62c717f133ce22e9dda4425f 176497835252cfdfe110e58ebde9fbde553d03e44e07d3e4d8041e835dbf31b9
 lib/codeql/rust/elements/StructExprField.qll 3eb9f17ecd1ad38679689eb4ecc169d3a0b5b7a3fc597ae5a957a7aea2f74e4f 8fcd26f266f203004899a60447ba16e7eae4e3a654fbec7f54e26857730ede93
 lib/codeql/rust/elements/StructExprFieldList.qll 6efb2ec4889b38556dc679bb89bbd4bd76ed6a60014c41f8e232288fc23b2d52 dc867a0a4710621e04b36bbec7d317d6f360e0d6ac68b79168c8b714babde31d
 lib/codeql/rust/elements/StructField.qll c43a552ce22c768c7f4c878501f08ecd4eae3554c5cd885dcd2e8625fe705233 bfd7934835ca41eb70e4064198d9b40ec9812842fb4349e412d1aaf98c3cd625
@@ -160,7 +159,7 @@ lib/codeql/rust/elements/TokenTree.qll 23e57fd945ce509df5122aa46f7971360788945cb
 lib/codeql/rust/elements/Trait.qll f78a917c2f2e5a0dfcd7c36e95ad67b1fa218484ee509610db8ca38453bebd4c 2a12f03870ebf86e104bdc3b61aae8512bfafbbf79a0cff5c3c27a04635926af
 lib/codeql/rust/elements/TraitAlias.qll 1d82d043f24dbac04baa7aa3882c6884b8ffbc5d9b97669ce8efb7e2c8d3d2c8 505ba5426e87b3c49721f440fbc9ad6b0e7d89d1b1a51ca3fa3a6cc2d36f8b82
 lib/codeql/rust/elements/TryExpr.qll cb452f53292a1396139f64a35f05bb11501f6b363f8affc9f2d5f1945ad4a647 d60ad731bfe256d0f0b688bdc31708759a3d990c11dee4f1d85ccc0d9e07bec9
-lib/codeql/rust/elements/TupleExpr.qll 561486554f0c397bc37c87894c56507771174bfb25f19b3bf258a94f67573e56 d523246820853ff0a7c6b5f9dbe73d42513cadd6d6b76ea7e64147140ac93c15
+lib/codeql/rust/elements/TupleExpr.qll 1b1be270198f9d3db1c28c4caaa4a7fe9b5ae14651f1a10e2891a7d78d6ad18b 4f585aa684dfbff753e342903ddd60ee4d7c374b8bddeb645784d10903c90ae0
 lib/codeql/rust/elements/TupleField.qll e20a991f7f1322cc7c05b2a8946d5017edb119812efa3e44daa94a5dff2d0c7b 8c25c9577fef8b5b9a4b285ceb7cfffcd8d89448035b1967cd7fda1503adfe13
 lib/codeql/rust/elements/TupleFieldList.qll b67cd2dec918d09e582467e5db7a38c8fa18350af591b43a1b450cd2026dbb67 22fdd1e77c16e3be4627ee7a45985b94785492d36056eeeff2c94b43450b48c8
 lib/codeql/rust/elements/TuplePat.qll 028cdea43868b0fdd2fc4c31ff25b6bbb40813e8aaccf72186051a280db7632e 38c56187971671e6a9dd0c6ccccb2ee4470aa82852110c6b89884496eb4abc64
@@ -168,7 +167,7 @@ lib/codeql/rust/elements/TupleStructPat.qll da398a23eb616bf7dd586b2a87f4ab00f286
 lib/codeql/rust/elements/TupleTypeRepr.qll 1ac5abf6281ea31680a4098407fbe55459d08f92a50dec20d1f8b93d498eee41 6d9625cce4e4abf6b6e6c22e47880fbd23740d07b621137bd7fa0a2ee13badd9
 lib/codeql/rust/elements/TypeAlias.qll b59f24488f0d7de8d4046a9e0ca1e1f54d1d5c11e035898b11ab97e151fc600f 7b25c9e14c8bb310cec796824904fcefced2cc486d55e981b80b7620e73dd2d7
 lib/codeql/rust/elements/TypeArg.qll e91dbb399d2ab7cf7af9dd5f743a551d0bf91dba3cfb76cea9e2d42ada0f9f2e c67d64e20e35a9bba5092651e0f82c75ba53b8c165e823bc81d67975107ae375
-lib/codeql/rust/elements/TypeBound.qll a1645f31a789995af85b1db236caece180013cc2e28e1c50b792dc0d4ab0854e 14a68ebef2149bc657ba1f18606ef8cf9b7cc3e6113b50bc038c168eb6cfd11c
+lib/codeql/rust/elements/TypeBound.qll 33583aed81734348c5097851cde3568668f259c000ccde901c75a3f2eef30237 3c9e541d47c5cfbcb0b1c5806f5d9abd7f51382d1efc1328742439e11285ab32
 lib/codeql/rust/elements/TypeBoundList.qll 61a861e89b3de23801c723531cd3331a61214817a230aaae74d91cb60f0e096f d54e3d830bb550c5ba082ccd09bc0dc4e6e44e8d11066a7afba5a7172aa687a8
 lib/codeql/rust/elements/TypeParam.qll 0787c1cc0c121e5b46f7d8e25153fd1b181bd3432eb040cf3b4ae3ed9ac2f28c 50092950f52a4e3bfd961dff4ffd8a719ef66ca1a0914bd33e26fed538321999
 lib/codeql/rust/elements/TypeRepr.qll ea41b05ef0aaac71da460f9a6a8331cf98166f2c388526068ddacbd67488c892 11a01e42dab9183bac14de1ca49131788ede99e75b0ef759efcbc7cf08524184
@@ -185,7 +184,7 @@ lib/codeql/rust/elements/Variant.qll 7895461fa728f6c3a7293799c5e6b965b413b679566
 lib/codeql/rust/elements/VariantList.qll 39803fbb873d48202c2a511c00c8eafede06e519894e0fd050c2a85bf5f4aa73 1735f89b2b8f6d5960a276b87ea10e4bb8c848c24a5d5fad7f3add7a4d94b7da
 lib/codeql/rust/elements/Visibility.qll aa69e8a3fd3b01f6fea0ae2d841a2adc51f4e46dcfc9f8f03c34fbe96f7e24e7 0d475e97e07b73c8da2b53555085b8309d8dc69c113bcb396fc901361dbfe6b8
 lib/codeql/rust/elements/WhereClause.qll 4e28e11ceec835a093e469854a4b615e698309cdcbc39ed83810e2e4e7c5953f 4736baf689b87dd6669cb0ef9e27eb2c0f2776ce7f29d7693670bbcea06eb4e4
-lib/codeql/rust/elements/WherePred.qll 490395b468c87d5c623f6741dc28512ee371cbf479ea77aee7e61b20544f5732 782f74b101d374a71908069be3db23755ab1473ffe879b368be73a5fdc6eac3a
+lib/codeql/rust/elements/WherePred.qll 589027c2fddb07620f74b8ed5e471fab49bef389749e498069d7c1fe50912cc7 dd7c90ff9c5bd563f0b8a088e0890ee11c6d5b2269223f22be01f0e1dbe0f5e2
 lib/codeql/rust/elements/WhileExpr.qll 4a37e3ecd37c306a9b93b610a0e45e18adc22fcd4ce955a519b679e9f89b97e8 82026faa73b94390544e61ed2f3aaeaabd3e457439bb76d2fb06b0d1edd63f49
 lib/codeql/rust/elements/WildcardPat.qll 4f941afc5f9f8d319719312399a8f787c75a0dbb709ec7cf488f019339635aab a9140a86da752f9126e586ddb9424b23b3fb4841a5420bac48108c38bb218930
 lib/codeql/rust/elements/YeetExpr.qll 4172bf70de31cab17639da6eed4a12a7afcefd7aa9182216c3811c822d3d6b17 88223aab1bef696f508e0605615d6b83e1eaef755314e6a651ae977edd3757c3
@@ -241,8 +240,6 @@ lib/codeql/rust/elements/internal/BoxPatConstructor.qll 153f110ba25fd6c889092bfd
 lib/codeql/rust/elements/internal/BreakExprConstructor.qll 356be043c28e0b34fdf925a119c945632ee883c6f5ebb9a27003c6a8d250afd9 bb77e66b04bb9489340e7506931559b94285c6904b6f9d2f83b214cba4f3cfd5
 lib/codeql/rust/elements/internal/CallExprConstructor.qll 742b38e862e2cf82fd1ecc4d4fc5b4782a9c7c07f031452b2bae7aa59d5aa13a cad6e0a8be21d91b20ac2ec16cab9c30eae810b452c0f1992ed87d5c7f4144dc
 lib/codeql/rust/elements/internal/CastExprConstructor.qll f3d6e10c4731f38a384675aeab3fba47d17b9e15648293787092bb3247ed808d d738a7751dbadb70aa1dcffcf8af7fa61d4cf8029798369a7e8620013afff4ed
-lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll 6e376ab9d40308e95bcdaf1cc892472c92099d477720192cd382d2c4e0d9c8a1 60a0efe50203ad5bb97bdfc06d602182edcc48ac9670f2d27a9675bd9fd8e19f
-lib/codeql/rust/elements/internal/ClosureBinderImpl.qll 9f6ce7068b5c17df44f00037ebb42e6c8fdbbbd09bf89951221fb04f378fbdf1 6e6e372e151fe0b0f17a5ea0ed774553b6ed0bf53e1d377e5ed24a0f98529735
 lib/codeql/rust/elements/internal/ClosureExprConstructor.qll a348229d2b25c7ebd43b58461830b7915e92d31ae83436ec831e0c4873f6218a 70a1d2ac33db3ac4da5826b0e8628f2f29a8f9cdfd8e4fd0e488d90ce0031a38
 lib/codeql/rust/elements/internal/CommentConstructor.qll 0b4a6a976d667bf7595500dfb91b9cfc87460a501837ba5382d9a8d8321d7736 7d02d8c94a319dc48e7978d5270e33fc5c308d443768ff96b618236d250123f1
 lib/codeql/rust/elements/internal/ConstArgConstructor.qll f63021dc1ca2276786da3a981d06c18d7a360b5e75c08bca5d1afece4f7c4a83 487a870cbf5ed6554d671a8e159edd9261d853eba2d28ce2bd459759f47f11f2
@@ -273,9 +270,10 @@ lib/codeql/rust/elements/internal/FieldExprConstructor.qll b3be2c4ccaf2c8a1283f3
 lib/codeql/rust/elements/internal/FieldListImpl.qll 6b80b573989ee85389c4485729a40c92c7e0a5b8a96a4385e812c74fb63c894f d333bcb043616b95ffefed4d216f94e5b07541f8153e4fb8084f4e793947b023
 lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll 61d8808ea027a6e04d5304c880974332a0195451f6b4474f84b3695ec907d865 0916c63a02b01a839fe23ec8b189d37dc1b8bc4e1ba753cbf6d6f5067a46965a
 lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll 6b66f9bda1b5deba50a02b6ac7deb8e922da04cf19d6ed9834141bc97074bf14 b0a07d7b9204256a85188fda2deaf14e18d24e8a881727fd6e5b571bf9debdc8
+lib/codeql/rust/elements/internal/ForBinderConstructor.qll 98f16b0106a19210713404f4be8b1b9f70c88efb0b88bdf2f9ea9c8fbd129842 a7af9e75f11d824a60c367924542a31a0f46f7b1f88d3ee330d4dd26b2f29df5
 lib/codeql/rust/elements/internal/ForExprConstructor.qll d79b88dac19256300b758ba0f37ce3f07e9f848d6ae0c1fdb87bd348e760aa3e 62123b11858293429aa609ea77d2f45cb8c8eebae80a1d81da6f3ad7d1dbc19b
 lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll eae141dbe9256ab0eb812a926ebf226075d150f6506dfecb56c85eb169cdc76b 721c2272193a6f9504fb780d40e316a93247ebfb1f302bb0a0222af689300245
-lib/codeql/rust/elements/internal/ForTypeReprImpl.qll 75747779312b3f3ffdd02188053ba3f46b8922f02630711902f7a27eecced31a 71a900f014758d1473ef198c71892d42e20dd96e934d4bedb74581964c4d1503
+lib/codeql/rust/elements/internal/ForTypeReprImpl.qll dbbcb86626dcba3d5534d461d7306c354a15f800ff37c1d039801b868179b387 f942eebb20fb2603b7bab0e90f3e3f7a3f87dd6229090fc011c692a52164ac90
 lib/codeql/rust/elements/internal/FormatArgsArgConstructor.qll 8bd9b4e035ef8adeb3ac510dd68043934c0140facb933be1f240096d01cdfa11 74e9d3bbd8882ae59a7e88935d468e0a90a6529a4e2af6a3d83e93944470f0ee
 lib/codeql/rust/elements/internal/FormatArgsArgImpl.qll 6a8f55e51e141e4875ed03a7cc65eea49daa349de370b957e1e8c6bc4478425c 7efab8981ccbe75a4843315404674793dda66dde02ba432edbca25c7d355778a
 lib/codeql/rust/elements/internal/FormatArgsExprConstructor.qll ce29ff5a839b885b1ab7a02d6a381ae474ab1be3e6ee7dcfd7595bdf28e4b558 63bf957426871905a51ea319662a59e38104c197a1024360aca364dc145b11e8
@@ -307,7 +305,7 @@ lib/codeql/rust/elements/internal/LiteralPatConstructor.qll b660cb428a0cba0b713f
 lib/codeql/rust/elements/internal/LoopExprConstructor.qll 45f3f8f7441fcab6adc58831421679ee07bac68ac0417f3cbc90c97426cc805b f7ab3361b4a11e898126378ea277d76949466946762cd6cb5e9e9b4bb9860420
 lib/codeql/rust/elements/internal/LoopingExprImpl.qll 17885c1bcf7b5a3f9c7bbad3d4d55e24372af0dedd5e7fc0efcfc0a8b2cdad70 104dc45ca399b9f6e8227ad561679f728d60170398a52b31fc90cb2a2dd3c33c
 lib/codeql/rust/elements/internal/MacroBlockExprConstructor.qll 90097c0d2c94083e997396e01cf24349af5eb1788060368dc21ae8cd8ce90d93 e067904a734356e38fbadbc4277629c5987adce6d8f7737f7458ac07e9b264af
-lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll f7a8dd1dcde2355353e17d06bb197e2d6e321ea64a39760a074d1887e68d63d6 8d429be9b6aa9f711e050b6b07f35637de22e8635a559e06dd9153a8b7947274
+lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll 323c0695ab1d8ee7d88a678eabdb6ac9d92293b9ae0846ec2c7ed8d76a591369 7b662b77cf2d885423d8734ff322c199650c1ea59a2c3371a1370efd7966e0c9
 lib/codeql/rust/elements/internal/MacroCallConstructor.qll 707fee4fba1fd632cd00128f493e8919eaaea552ad653af4c1b7a138e362907d b49e7e36bf9306199f2326af042740ff858871b5c79f6aeddf3d5037044dbf1f
 lib/codeql/rust/elements/internal/MacroDefConstructor.qll 382a3bdf46905d112ee491620cc94f87d584d72f49e01eb1483f749e4709c055 eb61b90d8d8d655c2b00ff576ae20c8da9709eeef754212bc64d8e1558ad05ce
 lib/codeql/rust/elements/internal/MacroDefImpl.qll 73db95ff82834e0063699c7d31349b65e95ba7436fe0a8914dbdd3a383f8b1c9 cd2f078f84ce73fdc88b207df105b297f2cd3b780428968214443af3a2719e8f
@@ -369,7 +367,6 @@ lib/codeql/rust/elements/internal/RefTypeReprConstructor.qll 8e7012b456ebf1cc7a2
 lib/codeql/rust/elements/internal/RefTypeReprImpl.qll 553dd95e1a49ab7aef5db08e7bb550104c604ec33c9a3c7529370cd47c6a0965 8902db7c814f631c2a995df5911a7b13b6a38c524417e4bbbf2bda74ad53e14c
 lib/codeql/rust/elements/internal/RenameConstructor.qll 65fa2e938978d154701e6cac05b56320b176ee014ef5c20a7b66f3e94fd5c4a7 dfc0ff4606b8e1c14003cc93a0811f4d62ec993b07ff3c1aa0776746577ed103
 lib/codeql/rust/elements/internal/RenameImpl.qll 61c681055f1f86402af0772539f702e9e19a123f8cfcfca225535c3a1a4cb1d7 1aa1c78616c4b54a31c8af74de141aef9e5ada53f3859df631ecb4238faabdbf
-lib/codeql/rust/elements/internal/ResolvableImpl.qll 7d6d02eceef54d588de6204abbcf7a6454916e49180e3db8a72131032cec5837 9c3a28ea0d293b449c69982e3695903a10510096e765a53c1b34ac3ad009a9f4
 lib/codeql/rust/elements/internal/RestPatConstructor.qll 45430925ddf08fba70ede44c7f413ddb41b3113c149b7efc276e0c2bf72507b4 25c678898d72446e7a975bb8b7f2fde51e55b59dbd42f2cca997c833b1a995f1
 lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll 6dcb56c92a13f5ca2c9a8344bc05638cc611543896c578cd6ca185054f155537 3fe34953ba397dc31533bd28b48df76693e86b51c4a89c26ad4dfdbd816a0874
 lib/codeql/rust/elements/internal/RetTypeReprImpl.qll 799e55ffcf27bf6f010419e1d61ebbbf3448e37b903b0f13984d0b44d6b7a999 be774bb09d121c35f40c75d5bee08918e7a6b5fccb4fd573fc55a650466b46e0
@@ -410,7 +407,7 @@ lib/codeql/rust/elements/internal/TraitConstructor.qll 1f790e63c32f1a22ae1b039ca
 lib/codeql/rust/elements/internal/TryExprConstructor.qll 98e3077ebc4d76f687488b344f532b698512af215b66f0a74b5cea8ed180836c b95603c10c262911eeffdf4ccba14849e8443916b360e287963d5f2582d8e434
 lib/codeql/rust/elements/internal/TryExprImpl.qll cacf43a49ba518be3f94e4a355f5889861edc41f77601eff27e0ed774eca6651 5f4a6a346ec457d5de89b32419e8b4c2deddc55e2d61dbb59842d7f34aa11c44
 lib/codeql/rust/elements/internal/TupleExprConstructor.qll 71c38786723225d3d90399b8a085b2b2664c62256654db9e1288fadd56745b9d 639ad70b49ebadc027127fbdc9de14e5180169a4285908233bc38ccac6f14110
-lib/codeql/rust/elements/internal/TupleExprImpl.qll 23a0e4367fbcfcec3e2cf4a429f329a222b399c6729dd60f7ea42550273a6132 615f3b4897fdcbfddcf5c58e6edd64bf6e395923af89cc4e2a336099168bb6ad
+lib/codeql/rust/elements/internal/TupleExprImpl.qll daabbc7dd36c615cdd8d3b59e06f4992a302b26554115711f733508836887abe 4c43a26e5f8b68d9d032bb5cd0af88cf9ac9b4b4e40af47dc85dd931ce9db6f8
 lib/codeql/rust/elements/internal/TupleFieldConstructor.qll 89d3cf2540235044ed5a89706cfbdebc5cdf9180fd5b6d3376c79a1b2c0430c0 16861fe089aac8e42a5a90d81dd48d5015391d0a06c78ca02bd876d65378699f
 lib/codeql/rust/elements/internal/TupleFieldListConstructor.qll 4335ba2061b6e4968db9ec05c0b4d3e6a564db89a2df69e036f317672a7900b1 0b8dded875dbf696cf588e8c21acc27332a2ff66ced7bfabdfc1ad621991f888
 lib/codeql/rust/elements/internal/TupleFieldListImpl.qll 74869e92a3cbdd7895adaaa418d29d5e97387daf46c17315f219ad967af15d76 5815e4b37db958663df1f6fedc9667a11b261c9c2133e3f983a3aedc452c01fc
@@ -422,7 +419,7 @@ lib/codeql/rust/elements/internal/TypeAliasConstructor.qll 048caa79eb7d400971e3e
 lib/codeql/rust/elements/internal/TypeArgConstructor.qll 51d621e170fdf5f91497f8cc8c1764ce8a59fde5a2b9ecfad17ce826a96c56c4 a5bbb329bde456a40ffa84a325a4be1271dbde842c1573d1beb7056c8fb0f681
 lib/codeql/rust/elements/internal/TypeArgImpl.qll 77886af8b2c045463c4c34d781c8f618eec5f5143098548047730f73c7e4a34a 6be6c519b71f9196e0559958e85efe8a78fbce7a90ca2401d7c402e46bc865c9
 lib/codeql/rust/elements/internal/TypeBoundConstructor.qll ba99616e65cf2811187016ff23e5b0005cfd0f1123622e908ff8b560aaa5847f fde78432b55b31cf68a3acb7093256217df37539f942c4441d1b1e7bf9271d89
-lib/codeql/rust/elements/internal/TypeBoundImpl.qll 8a68e3c3b2bffb02a11e07102f57e8806411dbcb57f24be27a0d615a1f6f20d4 e6c92d5df538a10519655c1d2a063bb1ca1538d5d8fe9353ed0e28ad6d56be0c
+lib/codeql/rust/elements/internal/TypeBoundImpl.qll 7274dc0307595f7431343d7542b9441362087bcb1115b21bc5ffa02f2d3dd678 257cad7cd2658cf707ee9ae2bb99a4c7e3e51e6c237d272f3058571f1e5cb133
 lib/codeql/rust/elements/internal/TypeBoundListConstructor.qll 4b634b3a4ca8909ce8c0d172d9258168c5271435474089902456c2e3e47ae1c5 3af74623ced55b3263c096810a685517d36b75229431b81f3bb8101294940025
 lib/codeql/rust/elements/internal/TypeBoundListImpl.qll 5641aca40c0331899f4291188e60945eb2a01679e3b33883053309fb3823d9ab c84bb1daa7c10f3bb634a179957934d7ae1bef1380fcd8a9c734004625575485
 lib/codeql/rust/elements/internal/TypeParamConstructor.qll a6e57cccd6b54fa68742d7b8ce70678a79ac133ea8c1bfa89d60b5f74ad07e05 0e5f45d250d736aaf40387be22e55288543bdb55bbb20ecb43f2f056e8be8b09
@@ -447,7 +444,7 @@ lib/codeql/rust/elements/internal/VisibilityImpl.qll 85c1e75d6a7f9246cfef5c261e2
 lib/codeql/rust/elements/internal/WhereClauseConstructor.qll 6d6f0f0376cf45fac37ea0c7c4345d08718d2a3d6d913e591de1de9e640317c9 ff690f3d4391e5f1fae6e9014365810105e8befe9d6b52a82625994319af9ffd
 lib/codeql/rust/elements/internal/WhereClauseImpl.qll 006e330df395183d15896e5f81128e24b8274d849fe45afb5040444e4b764226 ed5e8317b5f33104e5c322588dc400755c8852bbb77ef835177b13af7480fd43
 lib/codeql/rust/elements/internal/WherePredConstructor.qll f331c37085792a01159e8c218e9ef827e80e99b7c3d5978b6489808f05bd11f8 179cad3e4c5aaaf27755891694ef3569322fcf34c5290e6af49e5b5e3f8aa732
-lib/codeql/rust/elements/internal/WherePredImpl.qll 6cecb4a16c39a690d6549c0ca8c38cf2be93c03c167f81466b8b2572f8457ada ddf6583bc6e4aa4a32c156f7468a26780867b2973ff91e6fc4d1b1c72fdd0990
+lib/codeql/rust/elements/internal/WherePredImpl.qll eabd6553a16165ddb0103602d8cff65c6af22580ea7a0e2beabbf795ffabdb2d 8025d8bd2351ec2de8273225a6e59d46748d7bfd7e53251fa4eb90d5140afd92
 lib/codeql/rust/elements/internal/WhileExprConstructor.qll 01eb17d834584b3cba0098d367324d137aacfc60860752d9053ec414180897e7 e5e0999fb48a48ba9b3e09f87d8f44f43cc3d8a276059d9f67e7714a1852b8a5
 lib/codeql/rust/elements/internal/WildcardPatConstructor.qll 5980c4e5724f88a8cb91365fc2b65a72a47183d01a37f3ff11dcd2021e612dd9 c015e94953e02dc405f8cdc1f24f7cae6b7c1134d69878e99c6858143fc7ab34
 lib/codeql/rust/elements/internal/YeetExprConstructor.qll 7763e1717d3672156587250a093dd21680ad88c8224a815b472e1c9bba18f976 70dd1fd50824902362554c8c6075468060d0abbe3b3335957be335057512a417
@@ -455,7 +452,7 @@ lib/codeql/rust/elements/internal/YeetExprImpl.qll e8924147c3ebe0c32d04c5b33edfd
 lib/codeql/rust/elements/internal/YieldExprConstructor.qll 8cbfa6405acb151ee31ccc7c89336948a597d783e8890e5c3e53853850871712 966f685eb6b9063bc359213323d3ff760b536158ecd17608e7618a3e9adf475f
 lib/codeql/rust/elements/internal/YieldExprImpl.qll af184649a348ddd0be16dee9daae307240bf123ace09243950342e9d71ededd9 17df90f67dd51623e8a5715b344ccd8740c8fc415af092469f801b99caacb70d
 lib/codeql/rust/elements/internal/generated/Abi.qll f5a22afe5596c261b4409395056ce3227b25d67602d51d0b72734d870f614df3 06d1c242ccd31f1cc90212823077e1a7a9e93cd3771a14ebe2f0659c979f3dd1
-lib/codeql/rust/elements/internal/generated/Addressable.qll 96a8b45166dd035b8d2c6d36b8b67019f2d4d0b4ccff6d492677c0c87197613e d8f1ce29feafc8ff7179399fc7eac5db031a7e1a8bc6b2cd75cfce1da3132e9b
+lib/codeql/rust/elements/internal/generated/Addressable.qll 624c380d385af6563885417d1e8ecd5d9b7abf1435c0ab79a1b9a405387874a3 e2755dc2155d6f2bc0e2d54006da0e62ee359440592db9d6a8b73202ef28e64f
 lib/codeql/rust/elements/internal/generated/Adt.qll 155f4025a26c3d2d5d3c42dfce9274a10f0862ea0574843c5d276179de421569 17138b271eea81d3ee2697c82cccfd7af752cd18cd925dd5fa20d7fce0e2432f
 lib/codeql/rust/elements/internal/generated/ArgList.qll e41f48258082876a8ceac9107209d94fdd00a62d2e4c632987a01a8394c4aff6 bf1982d14f8cd55fa0c3da2c6aab56fc73b15a3572ffc72d9a94f2c860f8f3b7
 lib/codeql/rust/elements/internal/generated/ArrayExpr.qll 73806a0de8168b38a9436fa6b8c6d68c92eeab3d64a1ae7edfff82f871929992 7ad998cdd8f4fed226473517ad7a5765cb35608033047aad53bf8aa3969fd03b
@@ -466,7 +463,7 @@ lib/codeql/rust/elements/internal/generated/ArrayTypeRepr.qll d1db33bc2c13e5bc6f
 lib/codeql/rust/elements/internal/generated/AsmClobberAbi.qll 579cabafcf0387a9270112ffa53c0b542c1bfbbebfe5c916ac2e6a9b2453539a 8048f5d8759425c55dc46d8fe502687edc29209e290094e9bcd24ff943c8d801
 lib/codeql/rust/elements/internal/generated/AsmConst.qll 26c96fc41f2b517b7756fd602c8b0cd4849c7090013fb3f8a5e290e5eabe80cc f0f1bf3e8ae7e20e1c2ab638428190c58ee242a7d15c480ed9c5f789ce42c9cb
 lib/codeql/rust/elements/internal/generated/AsmDirSpec.qll 4064e9c98aeebfebf29d013f6280f44548996d6f185b19bf96b1b23384c976b9 2bb0b99d20c0fdd6d54d4a1947a02372b6e4b197fb887ad058290ae97f015953
-lib/codeql/rust/elements/internal/generated/AsmExpr.qll 35df35b391d8bf7ccc53b5ffb1b700984bf423cafc89003cb6e3abd92791a127 0fff4199625c179ab4117cfa9762390a259ea0cba902713efc0f5eb200746b99
+lib/codeql/rust/elements/internal/generated/AsmExpr.qll afabf734bf93040451cb22d22f71ab9b2abb176bd6e0d862f5cc67d687f84e4c 7e35b3bc93b5e6f6b7259f3261234421eb5778a47192bc0f5e54d062d3bc8dde
 lib/codeql/rust/elements/internal/generated/AsmLabel.qll 3e97e64f0682709f05464218e0182f64537e08079b0f276738c83eae92c22d25 3ce70364762bc8c0eeb13940406a0613a815a0ae68b24f7e3a1a649a6fe05c89
 lib/codeql/rust/elements/internal/generated/AsmOperand.qll a18ddb65ba0de6b61fb73e6a39398a127ccd4180b12fea43398e1e8f3e829ecd 22d2162566bcf18e8bb39eac9c1de0ae563013767ef5efebff6d844cb4038cae
 lib/codeql/rust/elements/internal/generated/AsmOperandExpr.qll 6ec1db45e8523331d516263476bbda1006251ce137c2cd324d9b6c6fabf358df b6278d4e605fb5422ab1e563649da793bacf28cd587328f9cc36ca57799510d0
@@ -492,8 +489,7 @@ lib/codeql/rust/elements/internal/generated/CallExpr.qll f1b8dae487077cc9d1dccf8
 lib/codeql/rust/elements/internal/generated/CallExprBase.qll 2268e01d65015014c05166161bb28e5a1e78164d525ca16fc1e3106866cf231d b2f9b912153ba4d3e3612df4f74ac0e83077c31d5b31383bd277974081417a56
 lib/codeql/rust/elements/internal/generated/Callable.qll 9a8661aa018fd90a21529760c1dbc46c1ad3649e17b030e59ced0683fbf83f8a 8b573adfc23ec0ac91949da415e6a0c988fa02cbce9534d45ac98a5512d7b1ca
 lib/codeql/rust/elements/internal/generated/CastExpr.qll ddc20054b0b339ad4d40298f3461490d25d00af87c876da5ffbc6a11c0832295 f4247307afcd74d80e926f29f8c57e78c50800984483e6b6003a44681e4a71f3
-lib/codeql/rust/elements/internal/generated/ClosureBinder.qll ab199df96f525a083a0762fd654cd098802033c79700a593bb204a9a0c69ec01 86b33543e0886715830cfcdaca43b555a242a4f12a4caa18b88732d5afb584bd
-lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 34149bf82f107591e65738221e1407ec1dc9cc0dfb10ae7f761116fda45162de fd2fbc9a87fc0773c940db64013cf784d5e4137515cc1020e2076da329f5a952
+lib/codeql/rust/elements/internal/generated/ClosureExpr.qll 1f77ea8ec01366f8027fa36793f7de5a74f562a1af1bf6954410e68670e6f68a bd61457093dcfc3985e6e526d4582299f29421bc7d3e9818e530152ac8ad8bed
 lib/codeql/rust/elements/internal/generated/Comment.qll cd1ef861e3803618f9f78a4ac00516d50ecfecdca1c1d14304dc5327cbe07a3b 8b67345aeb15beb5895212228761ea3496297846c93fd2127b417406ae87c201
 lib/codeql/rust/elements/internal/generated/Const.qll 3e606f0198b6461a94964dba7a4d386408f01651d75378eeab251dfceccf49c8 20fe276cded4764bdb1cd50de956bea88d7cd731909c0b84b4abb972b3094959
 lib/codeql/rust/elements/internal/generated/ConstArg.qll c52bf746f2dc89b8d71b8419736707bfcbb09cca424c3ba76e888e2add415bf6 89309a9df4fde23cfd3d8492908ccec4d90cc8457d35c507ef81371a369941b4
@@ -514,8 +510,9 @@ lib/codeql/rust/elements/internal/generated/ExtractorStep.qll 61cd504a1aab98b1c9
 lib/codeql/rust/elements/internal/generated/FieldExpr.qll d6077fcc563702bb8d626d2fda60df171023636f98b4a345345e131da1a03dfc 03f9eb65abfab778e6d2c7090c08fe75c38c967302f5a9fa96ab0c24e954929d
 lib/codeql/rust/elements/internal/generated/FieldList.qll 35bb72a673c02afafc1f6128aeb26853d3a1cdbaea246332affa17a023ece70e b7012dd214788de9248e9ab6eea1a896329d5731fa0b39e23df1b39df2b7eb9c
 lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll f218fa57a01ecc39b58fa15893d6499c15ff8ab8fd9f4ed3078f0ca8b3f15c7e 2d1a7325cf2bd0174ce6fc15e0cbe39c7c1d8b40db5f91e5329acb339a1ad1e8
+lib/codeql/rust/elements/internal/generated/ForBinder.qll 7be6b8e3934db8cd4ac326625cf637dda4b175fd7573a52d2feb147769c4c6a1 234484b9b4cf3a20c97334417700db5029da65313410b3c9e929512c509e5c27
 lib/codeql/rust/elements/internal/generated/ForExpr.qll 7c497d2c612fd175069037d6d7ff9339e8aec63259757bb56269e9ca8b0114ea dc48c0ad3945868d6bd5e41ca34a41f8ee74d8ba0adc62b440256f59c7f21096
-lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 36ea243bd5ada10c586d9430464761849506b91754cf045c59f4ae194e78a456 cc65dc72c87d0ad7be3263bbdd1c515a057e62e97b0a28f9c4b0f689ac3566b7
+lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll 7daa3b938592b590d604203e7d0fc5c34c2bffe6adcceee5a5e0c681ed16214c f1380179cbdc188ad133c946d9e17e85aed0d77771b319f663d8eada0f7cf17d
 lib/codeql/rust/elements/internal/generated/Format.qll 934351f8a8ffd914cc3fd88aca8e81bf646236fe34d15e0df7aeeb0b942b203f da9f146e6f52bafd67dcfd3b916692cf8f66031e0b1d5d17fc8dda5eefb99ca0
 lib/codeql/rust/elements/internal/generated/FormatArgsArg.qll c762a4af8609472e285dd1b1aec8251421aec49f8d0e5ce9df2cc5e2722326f8 c8c226b94b32447634b445c62bd9af7e11b93a706f8fa35d2de4fda3ce951926
 lib/codeql/rust/elements/internal/generated/FormatArgsExpr.qll 8aed8715a27d3af3de56ded4610c6792a25216b1544eb7e57c8b0b37c14bd9c1 590a2b0063d2ecd00bbbd1ce29603c8fd69972e34e6daddf309c915ce4ec1375
@@ -547,7 +544,7 @@ lib/codeql/rust/elements/internal/generated/LiteralPat.qll f36b09cf39330019c111e
 lib/codeql/rust/elements/internal/generated/Locatable.qll c897dc1bdd4dfcb6ded83a4a93332ca3d8f421bae02493ea2a0555023071775e b32d242f8c9480dc9b53c1e13a5cb8dcfce575b0373991c082c1db460a3e37b8
 lib/codeql/rust/elements/internal/generated/LoopExpr.qll db6bc87e795c9852426ec661fa2c2c54106805897408b43a67f5b82fb4657afd 1492866ccf8213469be85bbdbcae0142f4e2a39df305d4c0d664229ecd1ebdb9
 lib/codeql/rust/elements/internal/generated/LoopingExpr.qll 0792c38d84b8c68114da2bbdfef32ef803b696cb0fd06e10e101756d5c46976c 111fe961fad512722006323c3f2a075fddf59bd3eb5c7afc349835fcec8eb102
-lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 778376cdfa4caaa9df0b9c21bda5ff0f1037b730aa43efb9fb0a08998ef3999b 6df39efe7823ce590ef6f4bdfa60957ba067205a77d94ac089b2c6a7f6b7b561
+lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll 7705de831e797c8742726a3c28dd8f87f6c1b9e2cccd20f01839d161f7ca37c7 ac79c5c95befc82f53b620ccc8a28fd9cc0f9e00c585ed4032bd75f99e0935fa
 lib/codeql/rust/elements/internal/generated/MacroCall.qll 1a7ee9c782ebc9ab0a807762aabebc9e0a7ef10c6eb945679737598630b20af2 782a437654cb316355c020e89d50b07c93ba7817715fa5d42a9e807cf12d1a43
 lib/codeql/rust/elements/internal/generated/MacroDef.qll 90393408d9e10ff6167789367c30f9bfe1d3e8ac3b83871c6cb30a8ae37eef47 f022d1df45bc9546cb9fd7059f20e16a3acfaae2053bbd10075fe467c96e2379
 lib/codeql/rust/elements/internal/generated/MacroExpr.qll 5a86ae36a28004ce5e7eb30addf763eef0f1c614466f4507a3935b0dab2c7ce3 11c15e8ebd36455ec9f6b7819134f6b22a15a3644678ca96b911ed0eb1181873
@@ -560,7 +557,7 @@ lib/codeql/rust/elements/internal/generated/MatchArmList.qll 12d969ecb267a749918
 lib/codeql/rust/elements/internal/generated/MatchExpr.qll b686842e7000fd61e3a0598bf245fb4e18167b99eca9162fdfdff0b0963def22 00f1743b1b0f1a92c5a687f5260fda02d80cc5871694cad0d5e7d94bac7fe977
 lib/codeql/rust/elements/internal/generated/MatchGuard.qll 58fa1d6979ef22de2bd68574c7ffcf4a021d7543445f68834d879ff8cee3abcb 072f22a7929df3c0e764b2a770b4cdf03504b3053067d9b9008d6655fb5837e1
 lib/codeql/rust/elements/internal/generated/Meta.qll 15e98e8d38f5618b7053057a629b135aae5e105fbf72731833a644fb695244c0 2977b6a0781c89383e87c595b14a39851f27b2508296f3e77466eea44c916188
-lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 816267f27f990d655f1ef2304eb73a9468935ffbfddd908773a77fa3860bb970 adda2574300a169a13ea9e33af05c804bf00868d3e8930f0f78d6a8722ad688d
+lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll 0cd0f84147e5f3887d609cc58246eb493d3461aee00ff37e7d26282c835f73af 6f4c5dc1decbce54fc12300d34798b890a85129208b25565130205c9d8ee2e29
 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 e6bd6240a051383a52b21ab539bc204ce7bcd51a1a4379e497dff008d4eef5b4 578a3b45e70f519d57b3e3a3450f6272716c849940daee49889717c7aaa85fc9
@@ -575,11 +572,11 @@ lib/codeql/rust/elements/internal/generated/ParamList.qll eaa0cd4402d3665013d47e
 lib/codeql/rust/elements/internal/generated/ParenExpr.qll 812d2ff65079277f39f15c084657a955a960a7c1c0e96dd60472a58d56b945eb eb8c607f43e1fcbb41f37a10de203a1db806690e10ff4f04d48ed874189cb0eb
 lib/codeql/rust/elements/internal/generated/ParenPat.qll 24f9dc7fce75827d6fddb856cd48f80168143151b27295c0bab6db5a06567a09 ebadbc6f5498e9ed754b39893ce0763840409a0721036a25b56e1ead7dcc09aa
 lib/codeql/rust/elements/internal/generated/ParenTypeRepr.qll 03f5c5b96a37adeb845352d7fcea3e098da9050e534972d14ac0f70d60a2d776 ed3d6e5d02086523087adebce4e89e35461eb95f2a66d1d4100fe23fc691b126
-lib/codeql/rust/elements/internal/generated/ParentChild.qll 3657258593982c34cb5934cf51fe21a0749af3161890b43c20f2b327d89ecf77 83509d01d5735e297057327be7fbb837a4633604cf6641ba34bb4825798187da
+lib/codeql/rust/elements/internal/generated/ParentChild.qll 7d67059559590954faf55aab56885fedc7b7a63a37b7a871b19204c42d493a4d 04ad386fd2b4e5d0150887aad97cf3ed8406391c8bc95dd2de29eb29a2ac0b6e
 lib/codeql/rust/elements/internal/generated/ParenthesizedArgList.qll d901fdc8142a5b8847cc98fc2afcfd16428b8ace4fbffb457e761b5fd3901a77 5dbb0aea5a13f937da666ccb042494af8f11e776ade1459d16b70a4dd193f9fb
 lib/codeql/rust/elements/internal/generated/Pat.qll 3605ac062be2f294ee73336e9669027b8b655f4ad55660e1eab35266275154ee 7f9400db2884d336dd1d21df2a8093759c2a110be9bf6482ce8e80ae0fd74ed4
 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/PathAstNode.qll b02654422f80e398027069135bb01205358f0ab82ded3408d83d066f300996a3 345e7f92a75bfc71657b223602f60c36f7637d6f2e3798f07e2d2926eea2431b
 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
@@ -590,12 +587,11 @@ lib/codeql/rust/elements/internal/generated/PtrTypeRepr.qll 8d0ea4f6c7f8203340bf
 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 f5b37458fb9c16829da761323deab22b440c3cb5bf915e07ee3eb2315251020e 0198c8d6ac310f107e4685f6dc0bd2eb58800af41ab4ac4c15c42d8d575f4b0a
+lib/codeql/rust/elements/internal/generated/Raw.qll ae8ebdaa26dc2dfbcc8d64c9c7b296de2e0e78086ce7545cbedfa1f560ef2ffa 6a78058f346e34a2da4dd984f76bf848d7d6708d4c0a35151303748cb0ea92fa
 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 5b0663a6d234572fb3e467e276d019415caa95ef006438cc59b7af4e1783161e 0e27c8a8f0e323c0e4d6db01fca821bf07c0864d293cdf96fa891b10820c1e4b
 lib/codeql/rust/elements/internal/generated/Rename.qll 53dd50d35aa38cb6eb4174c94e8e23042b42bdc4f38df009489ebf707380483b db14fbce0d95b4dae3d7512f9bdee92e0dc2dffde5ba5d7458f2f5dd632876b0
-lib/codeql/rust/elements/internal/generated/Resolvable.qll 586eefb01794220679c3b5d69c059d50c2238cf78ab33efe7185bbd07dea8dbd 1b7c7297d541b9de9e881d18fed4ae40dd327396366a3a6f52a24b85685fa9c1
 lib/codeql/rust/elements/internal/generated/RestPat.qll 369f5828bb78f2856d528679a9869f81859b375c2f831ff72f4507daaee976e3 17f24ce8aa6a27359c10a654667b7877ca7a1509509e2ab246ed26fe15ef66b4
 lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll 7e782d6ca346fd4057e95a6eefe796e3fba7eef62144a0df78e2d115a7ae9ba9 d5da144e06d180673fa7ce274c5e7e2ca2db12b064df1155bc56f2f9378b58b4
 lib/codeql/rust/elements/internal/generated/ReturnExpr.qll c9c05400d326cd8e0da11c3bfa524daa08b2579ecaee80e468076e5dd7911d56 e7694926727220f46a7617b6ca336767450e359c6fa3782e82b1e21d85d37268
@@ -608,7 +604,7 @@ lib/codeql/rust/elements/internal/generated/Static.qll 1a6c87d3c5602e3d02268ebe2
 lib/codeql/rust/elements/internal/generated/Stmt.qll 8473ff532dd5cc9d7decaddcd174b94d610f6ca0aec8e473cc051dad9f3db917 6ef7d2b5237c2dbdcacbf7d8b39109d4dc100229f2b28b5c9e3e4fbf673ba72b
 lib/codeql/rust/elements/internal/generated/StmtList.qll 816aebf8f56e179f5f0ba03e80d257ee85459ea757392356a0af6dbd0cd9ef5e 6aa51cdcdc8d93427555fa93f0e84afdfbbd4ffc8b8d378ae4a22b5b6f94f48b
 lib/codeql/rust/elements/internal/generated/Struct.qll 999da1b46e40d6e03fd2338fea02429462877c329c5d1338618cbd886a81567e daa7ff7bd32c554462e0a1502d8319cb5e734e056d0564e06596e416e2b88e9d
-lib/codeql/rust/elements/internal/generated/StructExpr.qll c6d861eaa0123b103fd9ffd2485423419ef9b7e0b4af9ed2a2090d8ec534f65d 50da99ee44771e1239ed8919f711991dd3ec98589fbe49b49b68c88074a07d74
+lib/codeql/rust/elements/internal/generated/StructExpr.qll e77702890561102af38f52d836729e82569c964f8d4c7e680b27992c1ff0f141 23dc51f68107ab0e5c9dd88a6bcc85bb66e8e0f4064cb4d416f50f2ba5db698c
 lib/codeql/rust/elements/internal/generated/StructExprField.qll 6bdc52ed325fd014495410c619536079b8c404e2247bd2435aa7685dd56c3833 501a30650cf813176ff325a1553da6030f78d14be3f84fea6d38032f4262c6b0
 lib/codeql/rust/elements/internal/generated/StructExprFieldList.qll 298d33442d1054922d2f97133a436ee559f1f35b7708523284d1f7eee7ebf443 7febe38a79fadf3dcb53fb8f8caf4c2780f5df55a1f8336269c7b674d53c6272
 lib/codeql/rust/elements/internal/generated/StructField.qll 0ccd678b64b82fdab7ffe9eb74f0d393b22da4459fe72248828896b5204c009c 0faf5a517eccc43141a48809ed35b864341a35764de2dba7442daa899ff4ff69
@@ -616,14 +612,14 @@ lib/codeql/rust/elements/internal/generated/StructFieldList.qll 5da528a51a6a5db9
 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 1a95a1bd9f64fb18e9571657cf2d02a8b13c747048a1f0f74baf31b91f0392ad fc274e414ff4ed54386046505920de92755ad0b4d39a7523cdffa4830bd53b37
-lib/codeql/rust/elements/internal/generated/Synth.qll 4390996606c436cb34201d7dba9821a0d775d1707e54fbbe24cbf788d1d1d948 8e8077a387c69f7f5e3bdb2754654625c233283eb39eab33a72bde536f139a16
-lib/codeql/rust/elements/internal/generated/SynthConstructors.qll bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076 bcc7f617b775ac0c7f04b1cc333ed7cc0bd91f1fabc8baa03c824d1df03f6076
+lib/codeql/rust/elements/internal/generated/Synth.qll 4c741d502d21d449c4e01010776f767c69b408c80ce7d10784b599463bcfd0e3 c76b8628663c126914ead897c779ce782294e9109125d61de958e0eee543abce
+lib/codeql/rust/elements/internal/generated/SynthConstructors.qll f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a f41abfc73415b7accb38da7c107faebfe6843c270ad54e0e54a96e930dfe479a
 lib/codeql/rust/elements/internal/generated/Token.qll 77a91a25ca5669703cf3a4353b591cef4d72caa6b0b9db07bb9e005d69c848d1 2fdffc4882ed3a6ca9ac6d1fb5f1ac5a471ca703e2ffdc642885fa558d6e373b
 lib/codeql/rust/elements/internal/generated/TokenTree.qll 1a3c4f5f30659738641abdd28cb793dab3cfde484196b59656fc0a2767e53511 de2ebb210c7759ef7a6f7ee9f805e1cac879221287281775fc80ba34a5492edf
 lib/codeql/rust/elements/internal/generated/Trait.qll 8fa41b50fa0f68333534f2b66bb4ec8e103ff09ac8fa5c2cc64bc04beafec205 ce1c9aa6d0e2f05d28aab8e1165c3b9fb8e24681ade0cf6a9df2e8617abeae7e
 lib/codeql/rust/elements/internal/generated/TraitAlias.qll 40a296cf89eceaf02a32db90acb42bdc90df10e717bae3ab95bc09d842360a5b af85cf1f8fa46a8b04b763cdcacc6643b83c074c58c1344e485157d2ceb26306
 lib/codeql/rust/elements/internal/generated/TryExpr.qll 73052d7d309427a30019ad962ee332d22e7e48b9cc98ee60261ca2df2f433f93 d9dd70bf69eaa22475acd78bea504341e3574742a51ad9118566f39038a02d85
-lib/codeql/rust/elements/internal/generated/TupleExpr.qll 75186da7c077287b9a86fc9194221ab565d458c08a5f80b763e73be5b646b29f 0250d75c43e2e6f56cdc8a0c00cc42b3d459ea8d48172d236c8cdf0fe96dfed2
+lib/codeql/rust/elements/internal/generated/TupleExpr.qll 98f10bc72d09f98e3be87f41b1a3cbf037f4a7e3d3560dfa6d5759905a8177a5 6a9eb5568c518876b2912371e2b7b774cf5245097c5a0206eda35b749995f00b
 lib/codeql/rust/elements/internal/generated/TupleField.qll d546b4e0c1a0b243c2bf88b371377cf9a396ca497cd5e78915e0e552910b6093 c0a754d15e0de590ee15139d8d366e4d7e4d33882c943e6ea8fa5fa8dce790e3
 lib/codeql/rust/elements/internal/generated/TupleFieldList.qll fb76d1a395326361859177c05e90e5bbb22d37518758752e9d89906006fb683e f31508b120c36f569cc7dcae06c9e55cf875abfb2fbe54a64ec12d8b3d2db108
 lib/codeql/rust/elements/internal/generated/TuplePat.qll 4e13b509e1c9dd1581a9dc50d38e0a6e36abc1254ea9c732b5b3e6503335afeb 298028df9eb84e106e625ed09d6b20038ad47bfc2faf634a0ffea50b17b5805d
@@ -631,7 +627,7 @@ lib/codeql/rust/elements/internal/generated/TupleStructPat.qll 6539d0edbdc16e7df
 lib/codeql/rust/elements/internal/generated/TupleTypeRepr.qll 1756cdbad56d634bf4726bc39c768386754e62650492d7d6344012038236a05b 3ac0997a47f95f28cc70c782173ce345fcb5b073be10f3c0b414d1df8443e04c
 lib/codeql/rust/elements/internal/generated/TypeAlias.qll 0d0c97d9e9213b8f0390b3456737d4611701a570b9943bb20b348c4efc8e4693 a83c701c0d8914e01517dfa9253a12be962f0a7ed2f75fbaae25a13432db403f
 lib/codeql/rust/elements/internal/generated/TypeArg.qll 80245e4b52bef30e5033d4c765c72531324385deea1435dc623290271ff05b1d 097926e918dcd897ea1609010c5490dbf45d4d8f4cffb9166bcadf316a2f1558
-lib/codeql/rust/elements/internal/generated/TypeBound.qll fa5cf5370c3f69e687b5fc888d2ca29d0a45bd0824d1159a202eafae29e70601 e3bc6a1e5c0af374c60e83396c5b0ceda499fabd300c25017ae7d4d5b234b264
+lib/codeql/rust/elements/internal/generated/TypeBound.qll ed27681b76b8f3ad790daad4a08f3bc243452821246bcb240b1d925bc1c362a3 8fdc0caf91f1894d8711d68547185eb029446898b66f60fc0d10ef862cd6292e
 lib/codeql/rust/elements/internal/generated/TypeBoundList.qll c5d43dc27075a0d5370ba4bc56b4e247357af5d2989625deff284e7846a3a48b c33c87d080e6eb6df01e98b8b0031d780472fcaf3a1ed156a038669c0e05bf0a
 lib/codeql/rust/elements/internal/generated/TypeParam.qll 81a8d39f1e227de031187534e5d8e2c34f42ad3433061d686cadfbdd0df54285 893795d62b5b89997574e9057701d308bea2c4dca6053042c5308c512137e697
 lib/codeql/rust/elements/internal/generated/TypeRepr.qll 1e7b9d2ddab86e35dad7c31a6453a2a60747420f8bc2e689d5163cab4fec71bb eb80e3947649e511e7f3555ffc1fd87199e7a32624449ca80ffad996cdf9e2f3
@@ -648,12 +644,12 @@ lib/codeql/rust/elements/internal/generated/Variant.qll fa6909715133049b3dba4622
 lib/codeql/rust/elements/internal/generated/VariantList.qll 3f70bfde982e5c5e8ee45da6ebe149286214f8d40377d5bc5e25df6ae8f3e2d1 22e5f428bf64fd3fd21c537bfa69a46089aad7c363d72c6566474fbe1d75859e
 lib/codeql/rust/elements/internal/generated/Visibility.qll af1069733c0120fae8610b3ebbcdcebe4b4c9ce4c3e3d9be3f82a93541873625 266106bdff4d7041d017871d755c011e7dd396c5999803d9e46725b6a03a2458
 lib/codeql/rust/elements/internal/generated/WhereClause.qll aec72d358689d99741c769b6e8e72b92c1458138c097ec2380e917aa68119ff0 81bb9d303bc0c8d2513dc7a2b8802ec15345b364e6c1e8b300f7860aac219c36
-lib/codeql/rust/elements/internal/generated/WherePred.qll 9aa63abdf1202ee4708e7413401811d481eac55ba576a4950653395f931d1e90 ebb9f2883f811ea101220eac13d02d2893d2ec0231a29826a32b77cb2c88a5f8
+lib/codeql/rust/elements/internal/generated/WherePred.qll 73b28efc1682bf527bdc97a07568d08666d61686940400c99095cb9593bc8df3 2ec1fb5577d033c120d31f1620753b3618fcb7f384a35a6d3e6b5e0bb375a8a5
 lib/codeql/rust/elements/internal/generated/WhileExpr.qll 0353aab87c49569e1fbf5828b8f44457230edfa6b408fb5ec70e3d9b70f2e277 e1ba7c9c41ff150b9aaa43642c0714def4407850f2149232260c1a2672dd574a
 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 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3 6ebcf16ef214075bc43562c246c11f8b90c089ff1b5041ab1b39ab9f4a40e9b3
+lib/codeql/rust/elements.qll d3beb3a35f2b5ea47d60aeefd86fb0d6406dd0a1b7cd89aecbb2732b4e72da38 d3beb3a35f2b5ea47d60aeefd86fb0d6406dd0a1b7cd89aecbb2732b4e72da38
 test/extractor-tests/generated/Abi/Abi.ql 086ed104ab1a7e7fe5c1ed29e03f1719a797c7096c738868bf6ebe872ab8fdaa fe23fe67ab0d9201e1177ea3f844b18ed428e13e3ce77381bf2b6910adfa3a0e
 test/extractor-tests/generated/ArgList/ArgList.ql da97b5b25418b2aa8cb8df793f48870c89fa00759cdade8ddba60d7f1f4bbc01 acfd5d2caf67282ad2d57b961068472100482d0f770a52a3c00214c647d18c75
 test/extractor-tests/generated/ArrayListExpr/ArrayListExpr.ql 42b365276aa43e2cad588338463542d3ce1dd0db3a428621554584b07a1431d5 08a66a8b69af35ee3bc64c35c453a19a6c9881cc6cc7e65275d1fff056121270
@@ -662,7 +658,7 @@ test/extractor-tests/generated/ArrayTypeRepr/ArrayTypeRepr.ql b262300235ab5bf4fe
 test/extractor-tests/generated/AsmClobberAbi/AsmClobberAbi.ql adfcfcdc6ac2a9a4849ea592e37da4221b6279cf2ea1112d32b6c89fda33e85e 7438490536e27b7173dec731f6925531a0e3fa839639c97a53905ba72d7efbe5
 test/extractor-tests/generated/AsmConst/AsmConst.ql 82f322fc8a01f4ccc86b3ecca86a9515313120764c6a3ac00b968e4441625422 62831f204c5c2d0f155152c661f9b5d4a4b685df6e40693106fbef0379378981
 test/extractor-tests/generated/AsmDirSpec/AsmDirSpec.ql 518a739c91481f67b27bfd1989d9dcbada12de54901eb6d598c896cd72f1f5fe 4567661eecf475fb05e13749b9250bcec51056b6db5a6ae7df24b7ba5cfb88c2
-test/extractor-tests/generated/AsmExpr/AsmExpr.ql c6c0128b252a13d5acea9a07b3854625aa51ebcce9dd93c11b423c9929d441fb 7618977e43f202af5b7d21b67531c4795bb791abe3cb03ba4077913c430b31d5
+test/extractor-tests/generated/AsmExpr/AsmExpr.ql 817faad3ea0b9da9a12026a8cfd91a0363595ce594fc5bc6ac43b112f911b2cd f0d5866dec3474f13fc85686aeb63e2fa8079b8f2774f0185959be00314eff87
 test/extractor-tests/generated/AsmLabel/AsmLabel.ql 130bf49dc1f5ae79e3588415b9a4c25dfdcbcac1884db9b2fb802a68e33180e5 c087e47d8953d312488fcc0b1bcbfca02521e3683e2063eaf380d76399bca037
 test/extractor-tests/generated/AsmOperandExpr/AsmOperandExpr.ql e866fd4715e78511352bb286c1120cbd52c4d960664d57dd99f0380eb1db7109 081d6a6267a3e251a123099b4c1e7d3c5a3b56e0efe9db7c7db24db1c08b7e0d
 test/extractor-tests/generated/AsmOperandNamed/AsmOperandNamed.ql fb1eb1f275ad251ba2e0876cf1d097bb33f20d06b0e50f8c01f7c11c71057688 e308567ffd18671cf172853a5c594f0f211d492c7e2fb58be412703d1b342b41
@@ -681,36 +677,36 @@ test/extractor-tests/generated/BoxPat/BoxPat.ql 854c9ba4e045dbe7ea1666866c1c443a
 test/extractor-tests/generated/BreakExpr/BreakExpr.ql c2181211da3dfe983cfca93ead32d5d211e91181899b9477152c58124eaa846d 57e57b926e14db2efb2e88e04699608b2ba9797ee4f6c4f710135b6858982256
 test/extractor-tests/generated/CallExpr/CallExpr.ql 2a1cd4485ccd8d4eb24a75889e832612adef9bb7feae414c90572796380bc6d7 95060b92aa04d7ad1fc6603c5ec14a275a5788ecb5a19932732e28105607a3b7
 test/extractor-tests/generated/CastExpr/CastExpr.ql 3480ec51072399409b7553ab6139c832db6ed4ca991f3a7a2282a39afe07c6f2 614c8ea7a2fe30d57583dbf84ed7a12743c2aba49d8c6252d31af3ed10853a39
-test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b68285fec6224b156754f51ee75a9b7ed32edaa16527e6f657a73bf6dd97eba3 d02b1b6d66dea1da892447d7b309f9b6e4eda0dd02055d71706d52aa73b5b9c4
-test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql 849c874de45781b8491cee428cc00fefc8cdc76f87de8a373a181b16ce930ab1 5e570193befae7bfe6c21ce91e20afd52bb94f234e2be89d0974bd6337221508
+test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql f9002cc327769edff05ae428d0c01ba80e18a217057d4d2c3a31eb24ab659ed6 8af2986890d0f3dd77c72023d992d5e587c9922b6f3ea378a6e268a51cfbbda5
 test/extractor-tests/generated/Comment/Comment.ql 0e0454911d2cf2e7ef5c6d860b84c57b9d490090914ebcf4fa0e8a70f777f066 cbd1c195276ef163f8d3c122344738c884dc9fb70eb2f9b7067829d735d48c4c
-test/extractor-tests/generated/Const/Const.ql 28a0f2debbf73ae867fc2d08d8e54d9e96fea69522b7180a48495c9b7fce9367 54d4a68a2b67db95ceb856535a8b27860ce2b502da17a7eeea3bb554d7fb5e43
+test/extractor-tests/generated/Const/Const.ql 97797a56743b519c1990682ccb22af6d997ed5eea1e280b52ad31b16a5836f9e e5289ebcb71a25b7ac0a7e1aa0111e4f3ec83d26b7f83e819509c9b9d756921d
 test/extractor-tests/generated/ConstArg/ConstArg.ql 21c7caf1939ff9fcc1bf0fe6dec5c6a6929f714cf1e17faf7a2f4a31c910194b 61eac00f4727f7269f926c53f53a62b5fae82ce7a02b42d23b9de6337b6f9d6e
 test/extractor-tests/generated/ConstBlockPat/ConstBlockPat.ql e2198f9ef913f7ecb9e96a4e5e4849737b664dbdf1ef67428d372ea1c29bbb35 c49aaaafd65c4dfadd1fae42a2078dba90bbd3fa1bcb09b88501c5085ab22c49
 test/extractor-tests/generated/ConstParam/ConstParam.ql 6facb2402e1cbf23d836f619ef68e2d8496b3c0c438e71266de24d8690852468 211ed6f7384f86d849f559410b2ac09da3df278bdeea9e77c4d9c26a727a6990
 test/extractor-tests/generated/ContinueExpr/ContinueExpr.ql 58b5046a4da06a4cd2d942720603313126888b2249b218bef6f7c44ca469ccfa eeb84a04deb4c4496b7f9b38798cc7fdc179a486c8beaa0b33bf87e7f9482b1a
 test/extractor-tests/generated/Crate/MISSING_SOURCE.txt b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1 b6cf5771fdbbe981aeb3f443ec7a40517b6e99ffc9817fd8872c2e344240dae1
 test/extractor-tests/generated/DynTraitTypeRepr/DynTraitTypeRepr.ql ff54195d2e09424faaac4e145a40208bf0e57acc57dfa8247b3751862a317c4b 583d5b98aa31a9af6ad73df000ca529f57f67aa6daaa50ca5673a56eb57bf507
-test/extractor-tests/generated/Enum/Enum.ql 11b8b502f0e79e0447a3d014616798448130ec5d686b5b12e0db687786065f4f 5ea58a9b57ece63253a82599c096ebbbd0a3c4ad136ca20662f47a4bafd2df41
+test/extractor-tests/generated/Enum/Enum.ql 64ed7f25aaf5eff67687cd3aa2690017fb6f9651c959aed7b655d486be0e0c5b 1df131d8e12c4594715ed31191e960792c21727b403dce59207c514671e88d62
 test/extractor-tests/generated/ExprStmt/ExprStmt.ql 7c62a97f7f910ae6e0e9aff7fdd78b369d21257ccab52afe6307ddea2e15dad1 2d32a366c4acbea3136ff1f9f9dadf76b148f82ad1d7170f02efd977d8a07ae9
-test/extractor-tests/generated/ExternBlock/ExternBlock.ql ceb04a9596c73dc2e750ce1950cefcf0b5fffd1ab7dc3e723e4a6500b3ef3ab2 4f6ab037d307ff351a9e48c37b47b8f8f25de5f3d5ecb78cb8c39d7275751d29
-test/extractor-tests/generated/ExternCrate/ExternCrate.ql 7cd54aa65300453fc031e69fde24466d01cdfb8ba73e24e4d134fbd3847b15a8 6a6fdeaee88c74caf7345dc8b85f326032eb27e63aa63a6ed883256e4da86d3b
+test/extractor-tests/generated/ExternBlock/ExternBlock.ql b61e37f1c387bc91be127b5425089f9f1d687f4f1708cad334c0bb00dba5bae3 dc03f0f0912b2cfbce74c3bc31d261cdbea740847212ac3472ecf719d8eb71f7
+test/extractor-tests/generated/ExternCrate/ExternCrate.ql 55d2d9d32cb5e894cc2ee5242d688aaa8428ba7757cccea67d1c064db6de2514 46a2c57660a42ee6eaa532b0c86f4cc2d3de795c33ee7cadbff650bd0f23206b
 test/extractor-tests/generated/ExternItemList/ExternItemList.ql 7f4d538d8878a0166b1868f391abf34df1d5e986a7a2e9ceaddb36d95bc7f46c 37072596f5a1e28ad98cc87dbfed00afadd83fa007f03d5b17d4dee8922b100f
 test/extractor-tests/generated/FieldExpr/FieldExpr.ql 2a04baaf57a22b65bd5b9e142e59cc2b7d3dd3174910ddc0c2510094f2dd32b1 d8e4fb4384aade1770c907d16795a4af9884051390a5a05935ad4b4df2e757a0
 test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql 1501730f1e02e9d22b07b18bb42a5372e1d327bda62bdc81d75f9966946cb97d 28625f0b7ee4d7ab37fc13206585961e89a5e509a93215c16136d2382418b7af
+test/extractor-tests/generated/ForBinder/ForBinder.ql c95fd006eaddb9535eda0d527d71cdd5d3745fe464fd809a8d58b8c4dfc8790e 1d8b38059b8a25965eab9a8a1286384aa994d7cac7414b70b63c6a3d6bcf3c39
 test/extractor-tests/generated/ForExpr/ForExpr.ql 3bac38bf33e140ae9f88371ec90409f7de867e39cdea46f02b15519b236b57cb aade1baf6e6081b3b9bce5b7e95fe4b7ffe00ea9450fd6e1d6692ad97cf93fe9
-test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b74c0034bf5d1bb4a1a73ab822daca4572e80983a0c88620abe92bb794dd9cd8 a18f9a6d95b46b808c3a25e11fc54d2564ace67fb98d0c76632c5d5894b31030
+test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql 5961055988b3a7749fb80e24d924bf1b67b0c52a6c895379beedd66a34bad04f d8ab72fac742314ead1aa0e1fed2535cc6597d278f3eef017bc9f8fd8cde83e7
 test/extractor-tests/generated/FormatArgsExpr/Format.ql 237ed2e01d9a75ee8521d6578333a7b1d566f09ef2102c4efcbb34ea58f2f9e8 09007ce4de701c0d1c0967f4f728ea9e627d9db19431bd9caebbf28ee51a1f36
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsArg.ql 5abcb565dcd2822e2ea142d19b8c92194ee17c71c3db7595248690034559d174 1ffa743fc678701ffeefff6c14c1414bb9158e6756f32380dd590ff44b19ca5a
 test/extractor-tests/generated/FormatArgsExpr/FormatArgsExpr.ql 243c2f9d830f1eae915749e81ac78d3c140280385b0002d10fcc4d2feaf14711 72b90a99a8b1c16baf1e254e1e3463c3ce5409624a2a90829122717d4e5a2b74
 test/extractor-tests/generated/FormatArgsExpr/FormatArgument.ql 0a345eb48dba8e535d12a00e88008e71b3ce692fbf8f9686c8885e158635dffe eab1f230fd572474a3f304f97d05bbf4a004c52773aaf2d34f999192244c0b80
 test/extractor-tests/generated/FormatArgsExpr/FormatTemplateVariableAccess.ql 24108cdc54feb77c24bb7894744e36e374f0c03d46d6e6c3fcb2012b1ad117f6 05a6b6f51029ee1a15039aa9d738bb1fd7145148f1aad790198fba832572c719
-test/extractor-tests/generated/Function/Function.ql 3a30225887bd7d6fbcd6dda1c946683a2b0e289f45bc8a8fe832abe662024d4e 225475fa02be09a1b0c0fcd56a003b026b3ac938f591a47e8fbead4873b2b202
+test/extractor-tests/generated/Function/Function.ql 061b34449c170b0fe50bbf8fe7b47f7ffc30d119c2479b906cb233f4dff9f006 5bc406906ea1537ee8ae299e29a1fbfa197c5920f97ff87f2c82b555c739de82
 test/extractor-tests/generated/GenericArgList/GenericArgList.ql 9bd6873e56a381a693fed0f595d60d973d0073ba7afa303750d5c6a0b887a811 0b373079f65aa91cacabfc9729c91215082a915197eb657b66bcdb3b6d5e7e53
 test/extractor-tests/generated/GenericParamList/GenericParamList.ql 206f270690f5c142777d43cf87b65d6dda5ec9f3953c17ee943fe3d0e7b7761c 38a6e0bbca916778f85b106609df6d5929baed006d55811ec0d71c75fe137e92
 test/extractor-tests/generated/IdentPat/IdentPat.ql 23006eddf0ca1188e11ba5ee25ad62a83157b83e0b99119bf924c7f74fd8e70d 6e572f48f607f0ced309113304019ccc0a828f6ddd71e818369504dcf832a0b5
 test/extractor-tests/generated/IfExpr/IfExpr.ql 540b21838ad3e1ed879b66c1903eb8517d280f99babcbf3c5307c278db42f003 a6f84a7588ce7587936f24375518a365c571210844b99cb614596e14dd5e4dfd
-test/extractor-tests/generated/Impl/Impl.ql 6db0831b8b6bbb0168a63b49aae27022546256c19cc9b36d7fdebbea6a51f2f3 4d2e6b46a9a9397e6da6a58fcea6e75c5b5df37360cdfb2d6d477140c3958fb7
+test/extractor-tests/generated/Impl/Impl.ql a36ea392729a6be3ee0cc0d8871b3682cf8f0c15fb657d4d35f2ca76eeef3a74 1fa345ca3b4c16c740b5684c7fdaf1116d52c2932287703b33143a08e4d7d38e
 test/extractor-tests/generated/ImplTraitTypeRepr/ImplTraitTypeRepr.ql 311c6c1e18bd74fbcd367f940d2cf91777eaba6b3d6307149beb529216d086fb 16c7c81618d7f49da30b4f026dcacfb23ed130dbfcfa19b5cb44dc6e15101401
 test/extractor-tests/generated/IndexExpr/IndexExpr.ql ecfca80175a78b633bf41684a0f8f5eebe0b8a23f8de9ff27142936687711263 27d4832911f7272376a199550d57d8488e75e0eeeeb7abbfb3b135350a30d277
 test/extractor-tests/generated/InferTypeRepr/InferTypeRepr.ql 6ba01a9e229e7dfdb2878a0bdbeb6c0888c4a068984b820e7a48d4b84995daa2 7120cafd267e956dbb4af5e19d57237275d334ffe5ff0fb635d65d309381aa46
@@ -725,21 +721,21 @@ test/extractor-tests/generated/LifetimeParam/LifetimeParam.ql a96f586af332969878
 test/extractor-tests/generated/LiteralExpr/LiteralExpr.ql 00570642966d233a10ec3106ae65e6ea865c29d0776fdbc452815f528301117c adb286ad3bd763f1b1b350cac91bc2615869dcb9b0faf29276ace9a99d31f0cc
 test/extractor-tests/generated/LiteralPat/LiteralPat.ql 863d4902e7e22de3176398cbb908e6f5f487b3d22c0f9f7a5498a1ebc112c0fd 47e3f70c5c32f17050d3ca8c8b42d94ecd38e378627880d8100b7ca182cfa793
 test/extractor-tests/generated/LoopExpr/LoopExpr.ql a178e25f63b4d517482ec63e5dfb6903dd41dadd8db39be2dd2a831e8456811f f34165f78179960cc7e5876dac26a1d0f6f67933eff9a015b92ca0e2872b63e8
-test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 62859a25b88c93db1d47055f682f1b8ed97ef227c870bc14041af106cb9593fd 14c5831920249ef2e0799ddacca62805e2e2d8b8a6cbd244acb3a20c4542bf7b
-test/extractor-tests/generated/MacroCall/MacroCall.ql f98017f6070e2a5e4b191d5380cc0491d7358c456e8459b313235e44eb368794 437129210d9b7f6850adf4d2c8ef7d0644193418645d631b8edf229656fc57ac
-test/extractor-tests/generated/MacroDef/MacroDef.ql 9e3647a92713d32f87e876f37d703081855ea88a7a3104757f90bd94eb382fa9 b50e9797c1b8ea5491267ddb6778862f0541617ee60bd8e167cc23a499e36733
+test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql 936920b5b609b1e62b201004055bbce449d2d7c1f8016f57d9b27d3ea8107f07 21493009ed3b1810aa4fd8af4d8c7b7794982da032dfb6b7e9048445d651eecb
+test/extractor-tests/generated/MacroCall/MacroCall.ql 28abee68c0681334e4ffd412f1b9b9b0fe844a6ae6c915ec18ea186b4766f58e c8c73902827d69a4b903ab3028408086b64b9f5d9a4da97620a2100f45ceaf69
+test/extractor-tests/generated/MacroDef/MacroDef.ql edcdd65706641c2827cac546091a99e0a1473ff8d383efd968023db411591197 b7832c67c6dd32e9e5ecfa4b6256e7cd820f55d49c44458a140cbf4d46542eb3
 test/extractor-tests/generated/MacroExpr/MacroExpr.ql 83fadb88fd8f913bb1b1cda26d21b173bdc94bb6682a74eaddce650ebf72aa41 1c502cde6a95ec637e43d348c613be3dec4092b69d2c8692abdc5a9377e37f5f
 test/extractor-tests/generated/MacroItems/MacroItems.ql 0f8c1d134a28b80c70d5fff7c120f17350f6116689fdd7f67bdbfbaa0302c224 9f0594aa6d96c4f368d6c6521d0b58ab456611842afbfd040cb84f8858241677
 test/extractor-tests/generated/MacroPat/MacroPat.ql 71f65d80e670ec43db768693b8d44d627278a69e938517dc9068c76785ffd102 b1577dd669cafa9cf97aa998a7f30ac4a94aff129787a2d5a1cdac553fd56397
-test/extractor-tests/generated/MacroRules/MacroRules.ql d97daa29929a5bc4e25e65755c1929f9854beb1d2a183579a1ebec1d4b346dca 8b81026fa36152d870f91981a020ed0fa06cae0380d4e8d9496fea12a95b0326
+test/extractor-tests/generated/MacroRules/MacroRules.ql 9a6d5d9ec6cc77dd2f893e5315910c73f2ae2fc418b4a3a172799a16fefea456 413c8005e02dc1d79e6710e7dfc184cfa0e6bfb34d172b6b97bd7fa81ccd2594
 test/extractor-tests/generated/MacroTypeRepr/MacroTypeRepr.ql ebe8451a9256c9d7e77749beca88d0fd5ab73c76404bed4ff6e0c75f126159cc 72dd6d5ca4133e318fd51bb9007519b938e618cd4ef27bfe52b9c8c8cbd484ea
 test/extractor-tests/generated/MatchArm/MatchArm.ql 704976bd48e56a0a2fce7c2d9454b6cd24b1bf924633702ebcd71d8521b9b171 7c2bb501002c997a680c69b6d0856da13868125913e726f1a12b97907f32064a
 test/extractor-tests/generated/MatchArmList/MatchArmList.ql bbc679fe6d8dedf9131d0fa5faa7b44c138c5f56b9cf3cb209fd3ccd614b689c 916c53a2b68646b52f2d28eca2a19218ba9d12eb8edf7c6cc4140dace1bf4e0d
 test/extractor-tests/generated/MatchExpr/MatchExpr.ql b75a5936401bb5ca38686f1413f5c8267ad685722560a2e9041dacf2f8d54abc 7da57118fe5b1f7f5cbe8d6b5f3ae70816fd4837b1c2e6401b98175b36ca233f
 test/extractor-tests/generated/MatchGuard/MatchGuard.ql 91de18a0a18d120db568b2c329e5cb26f83e327cf22c5825c555ea17249d7d23 0bcdb25895362128517227c860b9dad76851215c2cdf9b2d0e5cc3534278f4ec
 test/extractor-tests/generated/Meta/Meta.ql 43dd1cd669099b38396b316616992af6d84b0c1cee953b19235a00ab3d3bb43c 80b1885809aa074357e21707d1f8c6dca19f0b968ccff43229bb0d5c6fffb2b2
-test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 617bc809816dc3cc1de1c0b49c494568164fe2a048472f4cce1b83f0a1f54a42 1b323e0b1812dbfdd78ee58798353e20326a3ca7529f52d5c984d1d92889a65f
-test/extractor-tests/generated/Module/Module.ql 4e154af13f19ee06e88ce8ff85e143bf6ddde798b2ec6fecebf43b8015211087 78f91c2827883ea7ed1f546de80d0909f4ac57b06027439f07dcdc0a09d7888d
+test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql 05ca29fdab8ce600469728b964c369368e5097b2a5eb35b84a7630ef044ac6b6 aa45fdbb7fba8afee9f6cef10d337622429d3f0fb71f7fbf861afb4906bdef71
+test/extractor-tests/generated/Module/Module.ql d7c442fd1b1f4f00da87e2228fc1aeeab0bb86648b2aa06a9dd6f40dbae1ee28 3229388727d14048e87238bcda5fde1bed503e5cac088922381e5833cfc32fa9
 test/extractor-tests/generated/Name/Name.ql b2fe417f7c816f71d12622b4f84ece74eba3c128c806266a55b53f8120fa4fb3 8bc65bbf3f2909637485f5db7830d6fc110a94c9b12eefe12d7627f41eae2256
 test/extractor-tests/generated/NameRef/NameRef.ql 210a70e0957f3444195eed3a3dfbb5806e349238c0b390dc00597e6b8b05fcec d74fbce3c71aa7b08ae4cb646ccb114335767cb4fe000322f9dd371c1bb3784f
 test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.ql 4e73ec96fccb00fe241546ff12c47329a9c67b7ae40a58a5afa39ecb611b84d4 bb716f72db039e0a82de959e390259a82cf99ba4482070602b7b6b42511976e5
@@ -752,8 +748,8 @@ test/extractor-tests/generated/ParenPat/ParenPat.ql 50f99c6a7e5e2f76dc5bbc10a6b2
 test/extractor-tests/generated/ParenTypeRepr/ParenTypeRepr.ql 86a45a9f9696a55562a7125f08297bcd50b368225a13cd31b6e9eb4071d04e13 53c0b8c4f453a748c9534220960c6ce8c52bd7501cf1d1f74e3928fc6512667c
 test/extractor-tests/generated/ParenthesizedArgList/ParenthesizedArgList.ql 6d0e3f7cbcc835f2a5784ccb09b0d65c2bb063c1904edded2e7fc8c9fb57c4fa e41c898b8b0d61078e0d76c6e2e141251dca71f79ad5fa119c012220c54cc409
 test/extractor-tests/generated/Path/Path.ql 0f6b63c723da7f140411c8e9a4bb9fbe043a997a1748a4a491add4bd6e81fd6e 5081db5bd590b72780c3c8032532e65b5d453c327c8771da6b87c10e30071523
-test/extractor-tests/generated/Path/PathExpr.ql 2b032a00d8f5570b34f44bdb4209f199f821e093011472b5c686918a063442a5 9f10b1e38863da09365fc45f749578dde74bbb64d35972fa34b83e6814f0004a
-test/extractor-tests/generated/Path/PathPat.ql 8d8053588dba1f35fff3bb89eb66f1534f637cf3b56338a6f3c19d748db7e1ca d7405ca5bf3bfa6960426964be3ea32562e1367c74b1f438c0827573eeaf773a
+test/extractor-tests/generated/Path/PathExpr.ql caa2a41b5cc3af837fcf52b49abc5f45ba924821ea0f75d5b25daa8d2b6d4b66 7c2d587d7a73c21dcc0a85c38baa0adcd64826719b2f12f92ae758d290f37706
+test/extractor-tests/generated/Path/PathPat.ql 8a6a759f4bbf4fa9c23fd235ce4d63f04bd715a86a6e71bba0a324fe1231d947 be23d83e4f6ac209f3f7c382fce6b9bc57db17a26b236bdf8215848285e345ff
 test/extractor-tests/generated/Path/PathSegment.ql 87774cc2e9d1be7aaf8748d418b151d7ec03fb20fda9430ebabd86ddaebf5538 699545d8eb2d6325bcd2c253d56339bd71170b34e80efe5155189fbbdde9fbbc
 test/extractor-tests/generated/Path/PathTypeRepr.ql 32023340cb9aa1fbf52a1a3e330c6f3206e1c64c9dce2f795d9e434aa5a1533b f451de0d4941ab79014d2883b46291f9f05f79d479fcdcab387020ab3ed68703
 test/extractor-tests/generated/PrefixExpr/PrefixExpr.ql 63e9dbae0d0b46d5e9d60c313e408c4c7ee1a93c5a26fe4c01a632911de961d0 09fcc28bb22553356aebf9ea93811703e5404b88022be8dab61ac81d3b187b75
@@ -772,44 +768,44 @@ test/extractor-tests/generated/SelfParam/SelfParam.ql 7e57dd845ddc9142cce250c7e6
 test/extractor-tests/generated/SlicePat/SlicePat.ql ec056b803471d22c8575313e0caca89a3d527d228719375e87cc6061c3da4ffe fb0af765ce9d04805cdd445e2222d6f956c6789285705bb1079e540935ae6cc5
 test/extractor-tests/generated/SliceTypeRepr/SliceTypeRepr.ql a009f2ba47f3b082db274b6bd7068d65c0205bd11b13d2c202e43a6b9b48e76b a3092ea5f2b7113235aec5136800205265f1607c5cfac9f5a3552bed5d98cdf2
 test/extractor-tests/generated/SourceFile/SourceFile.ql 19ae5570a88b9e2d82db66685a31b01cc8e0c86c622a4bfaabe8c5b397b27eea 60e2ba5eb82518d6408254fb4ec01277b6c6c0e4316d4f3cdc809da9c32c4a57
-test/extractor-tests/generated/Static/Static.ql 103276adfe23b609b5965439d024007d4ed6831562452f880ee89300aab3e3a6 0418668d83b2e570bddb6edbf4eb7927f4fa6933ccda86c0354463bb839f724f
+test/extractor-tests/generated/Static/Static.ql ec2e5cf081453bbae16216d1250f5d8324be81d1d6ad8744e969934d2ef21b0d 7bde1afbafdc16f9c999e902626c77dc0efe3f1b3d687e9fe1a3e9db6b1f62a9
 test/extractor-tests/generated/StmtList/StmtList.ql 4c6b9d5d8fd7535f97d81b968d4f67fc50e10c5d0f980e7c2704bbf5cd07481e ad972adb8d9a7892e6f8a12d96649340441f947afc99e633ea438c4d5c795ce4
-test/extractor-tests/generated/Struct/Struct.ql 197de8de01ede52110d827c4a673fcedc9175b1245b736a211b8724b4345902b fdf5d848a3b5dde164f1a540d7212fd3a3f6b0228c4645ddca773190830e2eb4
-test/extractor-tests/generated/StructExpr/StructExpr.ql 1e577f7cc83aa86fc82e4ac467bfb8a0c239408d4217f92a0a689957ea4fe6fe 35568a6cb7f0aaa3026e11a3b0e750eb5e93d4c0b6f737171e27c84f5dc967ac
+test/extractor-tests/generated/Struct/Struct.ql 846ef41cb4dfbe94f495fd68de26a68609e7b5ab0830d6ee844a67afea3ac591 6799a1246da45ecbf1f1040ffb7d1a5578ab9e236cce3029e6cc17c93b3bf138
+test/extractor-tests/generated/StructExpr/StructExpr.ql 3b98205260e750cc7adc42b318deef2854cc3b4f921cbcfffc6d701553af3903 368bccf01db2fa069dca30d9fb0878f8e6a88d4ce58b333b24a18620933e4c91
 test/extractor-tests/generated/StructExprField/StructExprField.ql b65375963aa24f0d1dd4c10784e32ab8c337ad431462ea1d081a0e456fbb1362 7f5a49e8df03ed0890b51c2e941d636fbbf70445a53d3af2c0f34a04f26bc6ef
 test/extractor-tests/generated/StructExprFieldList/StructExprFieldList.ql 01dc3ef66d79836a3d372464f05454015648ab093f9547c5d9c5d55271acb718 83625301c097fa38d4e6021ea28b8adc6338076c8c2aa88a86a22aac412839f6
 test/extractor-tests/generated/StructField/StructField.ql dbdb627202975a0ca07ed441449ecc95d9d0764084a49a18e7849164b2e65ce2 8e7f32f28d15104575eaa985e892c162ec775adf3481c227ef618b5668168de7
 test/extractor-tests/generated/StructFieldList/StructFieldList.ql 292170b20f3a55c0cd6a8d78ce99474ca68daf6fb380cffe00b2bd7074e1b73a 404bab780f290ae04d1d71d3c6d4e0092bb3d8c55e956168d2a445cbd6d1f06d
-test/extractor-tests/generated/StructPat/StructPat.ql 73bd755ffb8d5ff3c77d7570c6d50eab7b51d8d4a44b638cf5904c37065f496e 9589dc8d8abd80d9f48d445af3dbdbd906a9c19dc75582688bf9c3abaa16861e
+test/extractor-tests/generated/StructPat/StructPat.ql 894babd64d3def35717cbeed6eb4799cf9f52e73992822b72fc521c93efb4935 5bd1502b69014d70464b4b76795e1732ac2a6db5d028bea52929cf1998af5f07
 test/extractor-tests/generated/StructPatField/StructPatField.ql 92cb6a4b5234359c02d66085b10d41f37b77370491ed478ad6d4d9b12b943ecf 14bc2079763b53bc6ab11356f3bb21820ae9e4dd1b2a42a78665c32181c4ef92
 test/extractor-tests/generated/StructPatFieldList/StructPatFieldList.ql a3ba3e99d3c87d5e0ae0ad82cbea3600ac1745e9364d54d8d51224b51a5a09a5 5942ed2722c006bae99de9174249110bfc79594c5ef9a6dfc098ae2be269b8f3
 test/extractor-tests/generated/TokenTree/TokenTree.ql 55592f43a6fe99045d0b0b1e2323211d3a3fd64a8c7d2b083f2518d4c3e2e4b0 8eeef2060c80b0918857ba9b3a8543a4b866ca04be3d5ca18aae8a26cbdb836e
 test/extractor-tests/generated/Trait/AssocItemList.ql 065c4903992500423d796800e7dc9a5835a07cbada595108f3af6efa72517782 aa797bf5ddefb800d5ca7f49c19c5124b1007e1658129b27c8c3de34427c7f08
-test/extractor-tests/generated/Trait/Trait.ql ba40c2de2e8f2225ea7876c36b2510079838c0f4a99232bf0f3a3ab56b7705c4 c34364d0425f597a645fbb8b6a3874588cc652044909f1db73b09f2b6deae072
-test/extractor-tests/generated/TraitAlias/TraitAlias.ql 434558e26e1cdc4054536dd7a3e5e636509cd0f8576ba1612224a9873882a383 c904109afa94cffeacd6749dd4ad8b9d2e2cb3b228c275898d88625615dbedfc
+test/extractor-tests/generated/Trait/Trait.ql e59d9d97baedc5691f9fb837e3600b1b33808c598971d8abe28121a9c70292b4 0da2808421a1e1acbc61076d4b50c559f2abf02cbd5f69ba15a65457887ff435
+test/extractor-tests/generated/TraitAlias/TraitAlias.ql 9a4bcbf850afd833606f9447493b848e9a5df593198e5fc7a3a5bfb1c4c0782c 1f738eaf245220142d9fe5b88718980494b1e3c5b68609f5ee591056f23ea765
 test/extractor-tests/generated/TryExpr/TryExpr.ql 4e3c224a7d5fb8f01654c7d3c79414daa575897cfa6f351fcd5b5832f53a151f d961a497c304c1c5aa1d94e04aed2bf17a2c422e315f05986e1a9027e69dbd2a
 test/extractor-tests/generated/TupleExpr/TupleExpr.ql 4011d94438903e96fa321285558f5791bee7e1d1fb26be0381586511cf439d1b c6bc8d08a8d5d98d7a52b72d5c597b63754fe12cec653c520833e4b71a9dcea4
 test/extractor-tests/generated/TupleField/TupleField.ql ed681b7fee5e68d24db4999389727b2589e5af793d3c2ddc8b1e245713c0e1f8 4f867b29adf91b4bfa5052e16d392c16bf260e858aad11b60c42f1eddb476e61
 test/extractor-tests/generated/TupleFieldList/TupleFieldList.ql 3c3fcef21231550bbbf6804314b94d44cc18d445987c23cb6f2c88015570cc4a 8958e6748296bc6d0ad469e52852c38445fe462a8599a2e71867aa5d7066595e
 test/extractor-tests/generated/TuplePat/TuplePat.ql 80609f1c525e90e13f34d55a81d47a83a03e064241f8d33232e2a79eaeea5159 d289b19dae4cbae0180cc58bb946f41646bb9dc008f5ce8a0e12eaddbc7e63e9
-test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql d00b185013bb4e5f878a5ec261ab2cfbf1fe2f67d1ad2e05d062629211f677ec 24254631a28c24ca78b4fa1b89c53b0b002cb43fe585e274155fcca0c481056c
+test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql ea588383e16328486156e872f4d6f999a35534cde49d69b66a6186f01b1c2581 2a2e179b4241a4ff7d486e987cb667ba62025bc8dd48a507142cfec882bd35cc
 test/extractor-tests/generated/TupleTypeRepr/TupleTypeRepr.ql 2f1503734d272cd0616e5885cd344659cbd0ae7309a375c8351f57f2b86c3302 276a4fe91b8dc64cdca4467343e2bb2e240c66ec1e4e11bf8cba73819c6532cc
-test/extractor-tests/generated/TypeAlias/TypeAlias.ql 2b120c7fe640b233540f6982153fddf50ddc089b8284dca321b4c48eecf93dfd 6d40a0d8c927dd499fd92fd95638c50eeca8f956aa1706c17913dbf83f0f500c
+test/extractor-tests/generated/TypeAlias/TypeAlias.ql cbd2ed23ffff6bae81b121e32c9a7efce43c23d33f82fbfcee833b1043892c60 abf9779da9ee2b267a3dc3be7143f111cac8441c378828329749457bb56aeee3
 test/extractor-tests/generated/TypeArg/TypeArg.ql e1ca286c03bd2d44054f5dd75aac250382037f243046c49ec752ad8d65e4c0ba f316d5fa84a721427c0aadf6bfa0ed4cfd86e4d318cfb0fe82efc52e65c4733b
-test/extractor-tests/generated/TypeBound/TypeBound.ql 4f5a2a49075c01c982988e66759f61c5285343d78cda94e228e17593d16fee6e 7aae320e881d6ea969e31b1e8fe586feb07b1db43c65da684cbac66157354851
+test/extractor-tests/generated/TypeBound/TypeBound.ql 41d0a7b6538de12797c5aa4152ea701517abe685b1160615f2d74203e7a00d34 f57128c66df37791f93db269451b1c617c991d8723ecb9efe4b8ff8b2559472c
 test/extractor-tests/generated/TypeBoundList/TypeBoundList.ql 6827529eca62f5e7be87538af6231099f5932f39d8694f7a76369273b93f28ea 539dac4ccda7e51b7ae1a9e05d8a56a98176d9de25d5ed4347ebe2fbea8adeb1
 test/extractor-tests/generated/TypeParam/TypeParam.ql c5f8f62f2877c719c3cf069f9d0ca83cebc14f7611c6c2dce86c85114ea2635c 751c630986f35a8d0d32fbeb61ca6ff801c96cd1829dbccc874fbf5f5158e98d
 test/extractor-tests/generated/UnderscoreExpr/UnderscoreExpr.ql a7b7a93104fff28515154cf8e79045d3eea2494b5c46f1caf36639c53b1c64a7 070ee2e1664e3291646ea56681b5c93331f94dcc519deb28622beca3e26e16f3
-test/extractor-tests/generated/Union/Union.ql ef31f8b10ced5ed3a441f8ad0640e2fb46e566c859856e84f5a7fd6c85424b2c 1066561577ab19bf028ea29622750adc17de5b4d5dd0a8f77a8a50c8a15062b6
-test/extractor-tests/generated/Use/Use.ql a12b9867cc71a681cd4602c4045e75288a7cca502d48e20ccf17e155be130b3b 2b9dcac18670b062461193a6b40fcf569f19605b14daff82239fb39fd7fa3408
+test/extractor-tests/generated/Union/Union.ql 71e367ea4b541ee4ae831c69d0dfa2d1ba0c2d3dd9e9aba770dd00fd1f546ef8 61dbc6364a9f486d0de8c27cacbb9d1027282d92f89058e93e2c376588d809f9
+test/extractor-tests/generated/Use/Use.ql 1f084f3b49c910c6e01d2a81be2443e84c2836a5855b89874965efaf25d17511 d5bf37ba65f4d280312ca798bae22d2735c00cf91ff05ed6321f69b76b4551bc
 test/extractor-tests/generated/UseBoundGenericArgs/UseBoundGenericArgs.ql 46ff2cf0fc8b561b21f8dff3230550f2feafbe52a7ea8b28bf183abef94ff241 92646f3bd15a8cf4c23ee9de4d857ac5c147e570ef0eb223423a109b4b79aedf
 test/extractor-tests/generated/UseTree/UseTree.ql 3c2bc924b54b9af5c95784023d4098924571ba464c5982124acea712c3ce0e93 8d9f963b61a9a8a83efd93438ce8b43d4aa763493338ad9afd2a3dc7a440892d
 test/extractor-tests/generated/UseTreeList/UseTreeList.ql faff7bfc060d5b0a922f38b37bf586596566186f704c9921651785580e86d684 81e5b90edeef0d3883547844a030e72b555d714de1ed8dded1c22a3772b4449a
-test/extractor-tests/generated/Variant/Variant.ql 9405704e9192cac4838dcba8625261d5c1f839bb8c26dac44c2d517d172a06da 7236de83eb542cb4024e07d2cb5a899c851116a3a66b3896270ecf663439c6fe
+test/extractor-tests/generated/Variant/Variant.ql 6b1936698cec413f1645d52e3f4d6d995968d432466241eb823c1ae635c852dd 0b5b0248f09ae01b683ea835299d51fa26f6b5a584e889c538b0f0cf13106d0f
 test/extractor-tests/generated/VariantList/VariantList.ql 1c1d82ce3ecfa7daaae1920662510e81892ed899a3c2f785e2ff3670245a03cd 29d4c5ab2b737a92c7525789e10a4aa9848f1a327e34f4e9543018021106b303
 test/extractor-tests/generated/Visibility/Visibility.ql 725d47d7444332133df603f9b06592dc40b0f83bf5e21ad4781c5658e001a3aa 2d65a30702a8bb5bc91caf6ae2d0e4c769b3eeb0d72ffbd9cdb81048be4061ad
 test/extractor-tests/generated/WhereClause/WhereClause.ql a6f0e69ffa6b997cac04d4da442eb8bde517a576840c953abcc40863b9099ba1 7ce888fffc3038d5b18f8c94d3b045815cd45500e1bb3849c05fc874edbeb695
-test/extractor-tests/generated/WherePred/WherePred.ql 504d00a40e418542c3e0ff30d43c4d2d0e7218b2a31fcf32c9310d705d97b9fe 61c53dde539a9e1e3d6bf13ca1d0dab8af6ea6b54ab698a0a5a5f49bf627934b
+test/extractor-tests/generated/WherePred/WherePred.ql 8f73500a04f8748221b181bb9a51bef6c09d5ddf046488303594821e3191b370 8fb51d095a3c39b51ec8b4515fc02474ba36067ca4dfd48dff7e14d1c3881ea3
 test/extractor-tests/generated/WhileExpr/WhileExpr.ql dcfe1ed375514a7b7513272767ed195cdbf339b56e00e62d207ca1eee080f164 f067283510655f0cf810cae834ac29ad2c6007ba312d027ebcdf695a23ec33e4
 test/extractor-tests/generated/WildcardPat/WildcardPat.ql d36f52a1d00d338b43894b6f8e198ad0c409542f436e3e57d527205c3dfee38c 4e1321e714cedb606e0d84f10ed37c72da61b3a1616754b967f721ff0bc0e4ee
 test/extractor-tests/generated/YeetExpr/YeetExpr.ql 5c552b490ccf5b123f7a2fa3e73d03d008e4df5928ffa0bd503dc6bd7736462c 09a4f413ae045051abe392f29949d6feab1a808d666c6b8dac0901f84a8a4740
diff --git a/rust/ql/.gitattributes b/rust/ql/.gitattributes
index 4fc300e48cc4..71cd100d3f2e 100644
--- a/rust/ql/.gitattributes
+++ b/rust/ql/.gitattributes
@@ -38,7 +38,6 @@
 /lib/codeql/rust/elements/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/Callable.qll linguist-generated
 /lib/codeql/rust/elements/CastExpr.qll linguist-generated
-/lib/codeql/rust/elements/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/Comment.qll linguist-generated
 /lib/codeql/rust/elements/Const.qll linguist-generated
@@ -59,6 +58,7 @@
 /lib/codeql/rust/elements/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/FieldList.qll linguist-generated
 /lib/codeql/rust/elements/FnPtrTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/ForBinder.qll linguist-generated
 /lib/codeql/rust/elements/ForExpr.qll linguist-generated
 /lib/codeql/rust/elements/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Format.qll linguist-generated
@@ -136,7 +136,6 @@
 /lib/codeql/rust/elements/RefPat.qll linguist-generated
 /lib/codeql/rust/elements/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/Rename.qll linguist-generated
-/lib/codeql/rust/elements/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/RestPat.qll linguist-generated
 /lib/codeql/rust/elements/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/ReturnExpr.qll linguist-generated
@@ -243,8 +242,6 @@
 /lib/codeql/rust/elements/internal/BreakExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CallExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CastExprConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll linguist-generated
-/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/ClosureExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/CommentConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ConstArgConstructor.qll linguist-generated
@@ -275,6 +272,7 @@
 /lib/codeql/rust/elements/internal/FieldListImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/FnPtrTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/FnPtrTypeReprImpl.qll linguist-generated
+/lib/codeql/rust/elements/internal/ForBinderConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForExprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/ForTypeReprImpl.qll linguist-generated
@@ -371,7 +369,6 @@
 /lib/codeql/rust/elements/internal/RefTypeReprImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RenameImpl.qll linguist-generated
-/lib/codeql/rust/elements/internal/ResolvableImpl.qll linguist-generated
 /lib/codeql/rust/elements/internal/RestPatConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RetTypeReprConstructor.qll linguist-generated
 /lib/codeql/rust/elements/internal/RetTypeReprImpl.qll linguist-generated
@@ -494,7 +491,6 @@
 /lib/codeql/rust/elements/internal/generated/CallExprBase.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Callable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/CastExpr.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ClosureExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Comment.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Const.qll linguist-generated
@@ -516,6 +512,7 @@
 /lib/codeql/rust/elements/internal/generated/FieldExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FieldList.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/FnPtrTypeRepr.qll linguist-generated
+/lib/codeql/rust/elements/internal/generated/ForBinder.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForExpr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Format.qll linguist-generated
@@ -597,7 +594,6 @@
 /lib/codeql/rust/elements/internal/generated/RefPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RefTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/Rename.qll linguist-generated
-/lib/codeql/rust/elements/internal/generated/Resolvable.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RestPat.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/RetTypeRepr.qll linguist-generated
 /lib/codeql/rust/elements/internal/generated/ReturnExpr.qll linguist-generated
@@ -683,7 +679,6 @@
 /test/extractor-tests/generated/BreakExpr/BreakExpr.ql linguist-generated
 /test/extractor-tests/generated/CallExpr/CallExpr.ql linguist-generated
 /test/extractor-tests/generated/CastExpr/CastExpr.ql linguist-generated
-/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql linguist-generated
 /test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql linguist-generated
 /test/extractor-tests/generated/Comment/Comment.ql linguist-generated
 /test/extractor-tests/generated/Const/Const.ql linguist-generated
@@ -700,6 +695,7 @@
 /test/extractor-tests/generated/ExternItemList/ExternItemList.ql linguist-generated
 /test/extractor-tests/generated/FieldExpr/FieldExpr.ql linguist-generated
 /test/extractor-tests/generated/FnPtrTypeRepr/FnPtrTypeRepr.ql linguist-generated
+/test/extractor-tests/generated/ForBinder/ForBinder.ql linguist-generated
 /test/extractor-tests/generated/ForExpr/ForExpr.ql linguist-generated
 /test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql linguist-generated
 /test/extractor-tests/generated/FormatArgsExpr/Format.ql linguist-generated
diff --git a/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
index ef3e107fa760..e69de29bb2d1 100644
--- a/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
+++ b/rust/ql/integration-tests/hello-project/ExtractionWarnings.expected
@@ -1 +0,0 @@
-| src/directory_module/not_loaded.rs:1:1:1:1 | semantic analyzer unavailable (not included as a module) | Extraction warning in src/directory_module/not_loaded.rs with message semantic analyzer unavailable (not included as a module) | 1 |
diff --git a/rust/ql/integration-tests/hello-project/summary.expected b/rust/ql/integration-tests/hello-project/summary.expected
index 1f343b197c0f..0d639fe44f75 100644
--- a/rust/ql/integration-tests/hello-project/summary.expected
+++ b/rust/ql/integration-tests/hello-project/summary.expected
@@ -1,9 +1,9 @@
 | Extraction errors | 0 |
-| Extraction warnings | 1 |
+| Extraction warnings | 0 |
 | Files extracted - total | 5 |
-| Files extracted - with errors | 1 |
-| Files extracted - without errors | 4 |
-| Files extracted - without errors % | 80 |
+| Files extracted - with errors | 0 |
+| Files extracted - without errors | 5 |
+| Files extracted - without errors % | 100 |
 | Inconsistencies - AST | 0 |
 | Inconsistencies - CFG | 0 |
 | Inconsistencies - Path resolution | 0 |
diff --git a/rust/ql/integration-tests/qltest/test_qltest.py b/rust/ql/integration-tests/qltest/test_qltest.py
index edd62bf600ef..1fd525890cea 100644
--- a/rust/ql/integration-tests/qltest/test_qltest.py
+++ b/rust/ql/integration-tests/qltest/test_qltest.py
@@ -20,7 +20,7 @@ def test(codeql, rust, expected_files, dir):
     codeql.test.run(dir)
 
 def test_failing_cargo_check(codeql, rust):
-    out = codeql.test.run("failing_cargo_check", _assert_failure=True, _capture="stderr")
+    out = codeql.test.run("failing_cargo_check", _assert_failure=True, _capture="all")
     # TODO: QL test output redirection is currently broken on windows, leaving it up for follow-up work
     if not runs_on.windows:
         assert "requested cargo check failed" in out
diff --git a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
index a0ea519f7a19..5e1aecfab6e9 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-and-quality.qls.expected
@@ -11,6 +11,7 @@ ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
+ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
 ql/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
diff --git a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
index 5e2fb17298a5..88c07796c095 100644
--- a/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
+++ b/rust/ql/integration-tests/query-suite/rust-security-extended.qls.expected
@@ -11,6 +11,7 @@ ql/rust/ql/src/queries/diagnostics/UnresolvedMacroCalls.ql
 ql/rust/ql/src/queries/security/CWE-020/RegexInjection.ql
 ql/rust/ql/src/queries/security/CWE-022/TaintedPath.ql
 ql/rust/ql/src/queries/security/CWE-089/SqlInjection.ql
+ql/rust/ql/src/queries/security/CWE-117/LogInjection.ql
 ql/rust/ql/src/queries/security/CWE-311/CleartextTransmission.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextLogging.ql
 ql/rust/ql/src/queries/security/CWE-312/CleartextStorageDatabase.ql
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index 20275537b0c2..6ff2f1072c71 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.1.15
+
+### Major Analysis Improvements
+
+* Path resolution has been removed from the Rust extractor. For the majority of purposes CodeQL computed paths have been in use for several previous releases, this completes the transition. Extraction is now faster and more reliable.
+
+### Minor Analysis Improvements
+
+* Attribute macros are now taken into account when identifying macro-expanded code. This affects the queries `rust/unused-variable` and `rust/unused-value`, which exclude results in macro-expanded code.
+* Improved modelling of the `std::fs`, `async_std::fs` and `tokio::fs` libraries. This may cause more alerts to be found by Rust injection queries, particularly `rust/path-injection`.
+
 ## 0.1.14
 
 ### Minor Analysis Improvements
diff --git a/rust/ql/lib/Customizations.qll b/rust/ql/lib/Customizations.qll
new file mode 100644
index 000000000000..8fc6bbea9116
--- /dev/null
+++ b/rust/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `rust.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import rust
diff --git a/rust/ql/lib/change-notes/released/0.1.15.md b/rust/ql/lib/change-notes/released/0.1.15.md
new file mode 100644
index 000000000000..fa07f2597b1f
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.1.15.md
@@ -0,0 +1,10 @@
+## 0.1.15
+
+### Major Analysis Improvements
+
+* Path resolution has been removed from the Rust extractor. For the majority of purposes CodeQL computed paths have been in use for several previous releases, this completes the transition. Extraction is now faster and more reliable.
+
+### Minor Analysis Improvements
+
+* Attribute macros are now taken into account when identifying macro-expanded code. This affects the queries `rust/unused-variable` and `rust/unused-value`, which exclude results in macro-expanded code.
+* Improved modelling of the `std::fs`, `async_std::fs` and `tokio::fs` libraries. This may cause more alerts to be found by Rust injection queries, particularly `rust/path-injection`.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index 76f7b27fb4e4..747196347438 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.14
+lastReleaseVersion: 0.1.15
diff --git a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
index 4a4b637f3d3d..daa2cb1e818b 100644
--- a/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/BasicBlocks.qll
@@ -1,7 +1,10 @@
+private import codeql.controlflow.BasicBlock as BB
+private import codeql.Locations
+private import codeql.rust.controlflow.ControlFlowGraph as ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
 
-final class BasicBlock = BasicBlocksImpl::BasicBlock;
+class BasicBlock = BasicBlocksImpl::BasicBlock;
 
 final class EntryBasicBlock = BasicBlocksImpl::EntryBasicBlock;
 
@@ -14,3 +17,15 @@ final class ConditionBasicBlock = BasicBlocksImpl::ConditionBasicBlock;
 final class JoinBasicBlock = BasicBlocksImpl::JoinBasicBlock;
 
 final class JoinPredecessorBasicBlock = BasicBlocksImpl::JoinPredecessorBasicBlock;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowGraph::CfgNode;
+
+  class SuccessorType = ControlFlowGraph::SuccessorType;
+
+  class BasicBlock = BasicBlocksImpl::BasicBlock;
+
+  class EntryBasicBlock = BasicBlocksImpl::EntryBasicBlock;
+
+  predicate dominatingEdge = BasicBlocksImpl::dominatingEdge/2;
+}
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 36dd0fb304f2..9ce771983a3f 100644
--- a/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
+++ b/rust/ql/lib/codeql/rust/controlflow/internal/generated/CfgNodes.qll
@@ -1797,9 +1797,15 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
     /**
      * A sequence of statements generated by a `MacroCall`. For example:
      * ```rust
-     * fn main() {
-     *     println!("Hello, world!"); // This macro expands into a list of statements
+     * macro_rules! my_macro {
+     *     () => {
+     *         let mut x = 40;
+     *         x += 2;
+     *         x
+     *     };
      * }
+     *
+     * my_macro!();  // this macro expands to a sequence of statements (and an expression)
      * ```
      */
     final class MacroBlockExprCfgNode extends CfgNodeFinal, ExprCfgNode {
@@ -1810,18 +1816,6 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
       /** Gets the underlying `MacroBlockExpr`. */
       MacroBlockExpr getMacroBlockExpr() { result = node }
 
-      /**
-       * Gets the tail expression of this macro block expression, if it exists.
-       */
-      ExprCfgNode getTailExpr() {
-        any(ChildMapping mapping).hasCfgChild(node, node.getTailExpr(), this, result)
-      }
-
-      /**
-       * Holds if `getTailExpr()` exists.
-       */
-      predicate hasTailExpr() { exists(this.getTailExpr()) }
-
       /**
        * Gets the `index`th statement of this macro block expression (0-based).
        */
@@ -1836,6 +1830,18 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
        * Gets the number of statements of this macro block expression.
        */
       int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+      /**
+       * Gets the tail expression of this macro block expression, if it exists.
+       */
+      ExprCfgNode getTailExpr() {
+        any(ChildMapping mapping).hasCfgChild(node, node.getTailExpr(), this, result)
+      }
+
+      /**
+       * Holds if `getTailExpr()` exists.
+       */
+      predicate hasTailExpr() { exists(this.getTailExpr()) }
     }
 
     final private class ParentMacroCall extends ParentAstNode, MacroCall {
@@ -2938,8 +2944,8 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
      * ```rust
      * let first = Foo { a: 1, b: 2 };
      * let second = Foo { a: 2, ..first };
-     * Foo { a: 1, b: 2 }[2] = 10;
-     * Foo { .. } = second;
+     * let n = Foo { a: 1, b: 2 }.b;
+     * Foo { a: m, .. } = second;
      * ```
      */
     final class StructExprCfgNode extends CfgNodeFinal, ExprCfgNode {
@@ -3057,8 +3063,9 @@ module MakeCfgNodes<LocationSig Loc, InputSig<Loc> Input> {
     /**
      * A tuple expression. For example:
      * ```rust
-     * (1, "one");
-     * (2, "two")[0] = 3;
+     * let tuple = (1, "one");
+     * let n = (2, "two").0;
+     * let (a, b) = tuple;
      * ```
      */
     final class TupleExprCfgNode extends CfgNodeFinal, ExprCfgNode {
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
index 49a021563fd6..9ab04c7d0402 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/DataFlowImpl.qll
@@ -859,6 +859,7 @@ module RustDataFlow implements InputSig<Location> {
 module VariableCapture {
   private import codeql.rust.internal.CachedStages
   private import codeql.dataflow.VariableCapture as SharedVariableCapture
+  private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
 
   private predicate closureFlowStep(ExprCfgNode e1, ExprCfgNode e2) {
     Stages::DataFlowStage::ref() and
@@ -870,22 +871,13 @@ module VariableCapture {
     )
   }
 
-  private module CaptureInput implements SharedVariableCapture::InputSig<Location> {
+  private module CaptureInput implements
+    SharedVariableCapture::InputSig<Location, BasicBlocks::BasicBlock>
+  {
     private import rust as Ast
-    private import codeql.rust.controlflow.BasicBlocks as BasicBlocks
     private import codeql.rust.elements.Variable as Variable
 
-    class BasicBlock extends BasicBlocks::BasicBlock {
-      Callable getEnclosingCallable() { result = this.getScope() }
-    }
-
-    class ControlFlowNode = CfgNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
+    Callable basicBlockGetEnclosingCallable(BasicBlocks::BasicBlock bb) { result = bb.getScope() }
 
     class CapturedVariable extends Variable {
       CapturedVariable() { this.isCaptured() }
@@ -902,7 +894,7 @@ module VariableCapture {
     }
 
     class Expr extends CfgNode {
-      predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
+      predicate hasCfgNode(BasicBlocks::BasicBlock bb, int i) { this = bb.getNode(i) }
     }
 
     class VariableWrite extends Expr {
@@ -964,7 +956,7 @@ module VariableCapture {
 
   class CapturedVariable = CaptureInput::CapturedVariable;
 
-  module Flow = SharedVariableCapture::Flow<Location, CaptureInput>;
+  module Flow = SharedVariableCapture::Flow<Location, BasicBlocks::Cfg, CaptureInput>;
 
   private Flow::ClosureNode asClosureNode(Node n) {
     result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
index 9b6d254dec13..df0824fcdfc2 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/SsaImpl.qll
@@ -54,15 +54,7 @@ private predicate variableReadCertain(BasicBlock bb, int i, VariableAccess va, V
   )
 }
 
-module SsaInput implements SsaImplCommon::InputSig<Location> {
-  class BasicBlock = BasicBlocks::BasicBlock;
-
-  class ControlFlowNode = CfgNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) { result = bb.getImmediateDominator() }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
+module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlock> {
   class SourceVariable = Variable;
 
   predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
@@ -91,7 +83,7 @@ module SsaInput implements SsaImplCommon::InputSig<Location> {
   }
 }
 
-import SsaImplCommon::Make<Location, SsaInput> as Impl
+import SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput> as Impl
 
 class Definition = Impl::Definition;
 
@@ -324,7 +316,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
   private import codeql.util.Boolean
 
   class Expr extends CfgNodes::AstCfgNode {
-    predicate hasCfgNode(SsaInput::BasicBlock bb, int i) { this = bb.getNode(i) }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i) }
   }
 
   Expr getARead(Definition def) { result = Cached::getARead(def) }
@@ -357,9 +349,7 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * Holds if the evaluation of this guard to `branch` corresponds to the edge
      * from `bb1` to `bb2`.
      */
-    predicate hasValueBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       exists(Cfg::ConditionalSuccessor s |
         this = bb1.getANode() and
         bb2 = bb1.getASuccessor(s) and
@@ -372,15 +362,13 @@ private module DataFlowIntegrationInput implements Impl::DataFlowIntegrationInpu
      * branch edge from `bb1` to `bb2`. That is, following the edge from
      * `bb1` to `bb2` implies that this guard evaluated to `branch`.
      */
-    predicate valueControlsBranchEdge(
-      SsaInput::BasicBlock bb1, SsaInput::BasicBlock bb2, GuardValue branch
-    ) {
+    predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue branch) {
       this.hasValueBranchEdge(bb1, bb2, branch)
     }
   }
 
   /** Holds if the guard `guard` controls block `bb` upon evaluating to `branch`. */
-  predicate guardDirectlyControlsBlock(Guard guard, SsaInput::BasicBlock bb, GuardValue branch) {
+  predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue branch) {
     exists(ConditionBasicBlock conditionBlock, ConditionalSuccessor s |
       guard = conditionBlock.getLastNode() and
       s.getValue() = branch and
diff --git a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
index 0ae6aacb430d..b702c514c1ab 100644
--- a/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
+++ b/rust/ql/lib/codeql/rust/dataflow/internal/TaintTrackingImpl.qll
@@ -41,13 +41,15 @@ module RustTaintTracking implements InputSig<Location, RustDataFlow> {
         succ.asExpr() = index
       )
       or
-      // Although data flow through collections is modeled using stores/reads,
-      // we also allow taint to flow out of a tainted collection. This is
-      // needed in order to support taint-tracking configurations where the
-      // source is a collection.
-      exists(SingletonContentSet cs |
-        RustDataFlow::readStep(pred, cs, succ) and
+      // Although data flow through collections and references is modeled using
+      // stores/reads, we also allow taint to flow out of a tainted collection
+      // or reference.
+      // This is needed in order to support taint-tracking configurations where
+      // the source is a collection or reference.
+      exists(SingletonContentSet cs | RustDataFlow::readStep(pred, cs, succ) |
         cs.getContent() instanceof ElementContent
+        or
+        cs.getContent() instanceof ReferenceContent
       )
       or
       exists(FormatArgsExprCfgNode format | succ.asExpr() = format |
diff --git a/rust/ql/lib/codeql/rust/elements.qll b/rust/ql/lib/codeql/rust/elements.qll
index cd44985675f3..b42a93efc6c3 100644
--- a/rust/ql/lib/codeql/rust/elements.qll
+++ b/rust/ql/lib/codeql/rust/elements.qll
@@ -41,7 +41,6 @@ import codeql.rust.elements.CallExpr
 import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Callable
 import codeql.rust.elements.CastExpr
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.ClosureExpr
 import codeql.rust.elements.Comment
 import codeql.rust.elements.Const
@@ -62,6 +61,7 @@ import codeql.rust.elements.ExternItemList
 import codeql.rust.elements.FieldExpr
 import codeql.rust.elements.FieldList
 import codeql.rust.elements.FnPtrTypeRepr
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.ForExpr
 import codeql.rust.elements.ForTypeRepr
 import codeql.rust.elements.Format
@@ -139,7 +139,6 @@ import codeql.rust.elements.RefExpr
 import codeql.rust.elements.RefPat
 import codeql.rust.elements.RefTypeRepr
 import codeql.rust.elements.Rename
-import codeql.rust.elements.Resolvable
 import codeql.rust.elements.RestPat
 import codeql.rust.elements.RetTypeRepr
 import codeql.rust.elements.ReturnExpr
diff --git a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
index 06cee086b3f8..a4b588ff985b 100644
--- a/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/AsmExpr.qll
@@ -7,6 +7,7 @@ private import internal.AsmExprImpl
 import codeql.rust.elements.AsmPiece
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
+import codeql.rust.elements.Item
 
 /**
  * An inline assembly expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
index d1f73bfaadbd..e2e2c067e46b 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ClosureExpr.qll
@@ -5,8 +5,8 @@
 
 private import internal.ClosureExprImpl
 import codeql.rust.elements.Callable
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.RetTypeRepr
 
 /**
@@ -15,10 +15,13 @@ import codeql.rust.elements.RetTypeRepr
  * |x| x + 1;
  * move |x: i32| -> i32 { x + 1 };
  * async |x: i32, y| x + y;
- *  #[coroutine]
+ * #[coroutine]
  * |x| yield x;
- *  #[coroutine]
- *  static |x| yield x;
+ * #[coroutine]
+ * static |x| yield x;
+ * for<T: std::fmt::Debug> |x: T| {
+ *     println!("{:?}", x);
+ * };
  * ```
  */
 final class ClosureExpr = Impl::ClosureExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/ForBinder.qll
similarity index 60%
rename from rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
rename to rust/ql/lib/codeql/rust/elements/ForBinder.qll
index 0bf9579b2f0e..3dfff62d1e6f 100644
--- a/rust/ql/lib/codeql/rust/elements/ClosureBinder.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForBinder.qll
@@ -1,14 +1,14 @@
 // generated by codegen, do not edit
 /**
- * This module provides the public class `ClosureBinder`.
+ * This module provides the public class `ForBinder`.
  */
 
-private import internal.ClosureBinderImpl
+private import internal.ForBinderImpl
 import codeql.rust.elements.AstNode
 import codeql.rust.elements.GenericParamList
 
 /**
- * A closure binder, specifying lifetime or type parameters for a closure.
+ * A for binder, specifying lifetime or type parameters for a closure or a type.
  *
  * For example:
  * ```rust
@@ -21,4 +21,4 @@ import codeql.rust.elements.GenericParamList
  * print_any("hello");
  * ```
  */
-final class ClosureBinder = Impl::ClosureBinder;
+final class ForBinder = Impl::ForBinder;
diff --git a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
index c52c92197bbb..4b882044d06c 100644
--- a/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/ForTypeRepr.qll
@@ -4,21 +4,16 @@
  */
 
 private import internal.ForTypeReprImpl
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.TypeRepr
 
 /**
- * A higher-ranked trait bound.
+ * A function pointer type with a `for` modifier.
  *
  * For example:
  * ```rust
- * fn foo<T>(value: T)
- * where
- *     T: for<'a> Fn(&'a str) -> &'a str
- * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
- * {
- *     // ...
- * }
+ * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+ * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class ForTypeRepr = Impl::ForTypeRepr;
diff --git a/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
index 8fcd2119a0ae..0ad76f8a9733 100644
--- a/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MacroBlockExpr.qll
@@ -10,9 +10,15 @@ import codeql.rust.elements.Stmt
 /**
  * A sequence of statements generated by a `MacroCall`. For example:
  * ```rust
- * fn main() {
- *     println!("Hello, world!"); // This macro expands into a list of statements
+ * macro_rules! my_macro {
+ *     () => {
+ *         let mut x = 40;
+ *         x += 2;
+ *         x
+ *     };
  * }
+ *
+ * my_macro!();  // this macro expands to a sequence of statements (and an expression)
  * ```
  */
 final class MacroBlockExpr = Impl::MacroBlockExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
index c3d62106100e..fca8b0861345 100644
--- a/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/MethodCallExpr.qll
@@ -8,7 +8,6 @@ import codeql.rust.elements.CallExprBase
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.Resolvable
 
 /**
  * A method call expression. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/PathAstNode.qll b/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
index c8ff02e634c8..2e97383cf739 100644
--- a/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
+++ b/rust/ql/lib/codeql/rust/elements/PathAstNode.qll
@@ -4,8 +4,8 @@
  */
 
 private import internal.PathAstNodeImpl
+import codeql.rust.elements.AstNode
 import codeql.rust.elements.Path
-import codeql.rust.elements.Resolvable
 
 /**
  * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
diff --git a/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll b/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
index b4a045e6c0b3..40c2755d5c7a 100644
--- a/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
+++ b/rust/ql/lib/codeql/rust/elements/RangeExprExt.qll
@@ -46,6 +46,20 @@ final class RangeFromToExpr extends RangeExpr {
   }
 }
 
+/**
+ * A range-full expression. For example:
+ * ```rust
+ * let x = ..;
+ * ```
+ */
+final class RangeFullExpr extends RangeExpr {
+  RangeFullExpr() {
+    this.getOperatorName() = ".." and
+    not this.hasStart() and
+    not this.hasEnd()
+  }
+}
+
 /**
  * A range-inclusive expression. For example:
  * ```rust
diff --git a/rust/ql/lib/codeql/rust/elements/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/Resolvable.qll
deleted file mode 100644
index 6a2304a3be7d..000000000000
--- a/rust/ql/lib/codeql/rust/elements/Resolvable.qll
+++ /dev/null
@@ -1,12 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the public class `Resolvable`.
- */
-
-private import internal.ResolvableImpl
-import codeql.rust.elements.AstNode
-
-/**
- * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
- */
-final class Resolvable = Impl::Resolvable;
diff --git a/rust/ql/lib/codeql/rust/elements/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
index ededc485eb65..dfb1ae4f819a 100644
--- a/rust/ql/lib/codeql/rust/elements/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/StructExpr.qll
@@ -13,8 +13,8 @@ import codeql.rust.elements.StructExprFieldList
  * ```rust
  * let first = Foo { a: 1, b: 2 };
  * let second = Foo { a: 2, ..first };
- * Foo { a: 1, b: 2 }[2] = 10;
- * Foo { .. } = second;
+ * let n = Foo { a: 1, b: 2 }.b;
+ * Foo { a: m, .. } = second;
  * ```
  */
 final class StructExpr = Impl::StructExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
index e66d46957fc7..471abb51a3b2 100644
--- a/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/TupleExpr.qll
@@ -10,8 +10,9 @@ import codeql.rust.elements.Expr
 /**
  * A tuple expression. For example:
  * ```rust
- * (1, "one");
- * (2, "two")[0] = 3;
+ * let tuple = (1, "one");
+ * let n = (2, "two").0;
+ * let (a, b) = tuple;
  * ```
  */
 final class TupleExpr = Impl::TupleExpr;
diff --git a/rust/ql/lib/codeql/rust/elements/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
index c49d8e5be063..fd9d460b09ae 100644
--- a/rust/ql/lib/codeql/rust/elements/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/TypeBound.qll
@@ -5,6 +5,7 @@
 
 private import internal.TypeBoundImpl
 import codeql.rust.elements.AstNode
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UseBoundGenericArgs
@@ -16,6 +17,8 @@ import codeql.rust.elements.UseBoundGenericArgs
  * ```rust
  * fn foo<T: Debug>(t: T) {}
  * //        ^^^^^
+ * fn bar(value: impl for<'a> From<&'a str>) {}
+ * //                 ^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class TypeBound = Impl::TypeBound;
diff --git a/rust/ql/lib/codeql/rust/elements/WherePred.qll b/rust/ql/lib/codeql/rust/elements/WherePred.qll
index 16e1e586570e..7141819362ae 100644
--- a/rust/ql/lib/codeql/rust/elements/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/WherePred.qll
@@ -5,7 +5,7 @@
 
 private import internal.WherePredImpl
 import codeql.rust.elements.AstNode
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeRepr
@@ -17,6 +17,8 @@ import codeql.rust.elements.TypeRepr
  * ```rust
  * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
  * //                             ^^^^^^^^  ^^^^^^^^
+ * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+ * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
  * ```
  */
 final class WherePred = Impl::WherePred;
diff --git a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
index cdccc3f31d99..19abc6e3df34 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/CallExprBaseImpl.qll
@@ -5,7 +5,6 @@
  */
 
 private import codeql.rust.elements.internal.generated.CallExprBase
-private import codeql.rust.elements.Resolvable
 
 /**
  * INTERNAL: This module contains the customizable definition of `CallExprBase` and should not
@@ -15,13 +14,6 @@ module Impl {
   private import rust
   private import codeql.rust.internal.TypeInference as TypeInference
 
-  pragma[nomagic]
-  Resolvable getCallResolvable(CallExprBase call) {
-    result = call.(MethodCallExpr)
-    or
-    result = call.(CallExpr).getFunction().(PathExpr)
-  }
-
   // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
    * A function or method call expression. See `CallExpr` and `MethodCallExpr` for further details.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
index e96ae47e3015..960a91e9ee5f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ClosureExprImpl.qll
@@ -18,10 +18,13 @@ module Impl {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    */
   class ClosureExpr extends Generated::ClosureExpr {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll b/rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
similarity index 61%
rename from rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
index 0213547728fd..1dfea8c72ab3 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderConstructor.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForBinderConstructor.qll
@@ -1,14 +1,14 @@
 // generated by codegen, remove this comment if you wish to edit this file
 /**
  *  This module defines the hook used internally to tweak the characteristic predicate of
- *  `ClosureBinder` synthesized instances.
+ *  `ForBinder` synthesized instances.
  *  INTERNAL: Do not use.
  */
 
 private import codeql.rust.elements.internal.generated.Raw
 
 /**
- *  The characteristic predicate of `ClosureBinder` synthesized instances.
+ *  The characteristic predicate of `ForBinder` synthesized instances.
  *  INTERNAL: Do not use.
  */
-predicate constructClosureBinder(Raw::ClosureBinder id) { any() }
+predicate constructForBinder(Raw::ForBinder id) { any() }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
similarity index 53%
rename from rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
rename to rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
index 095a5a269e0f..9f9b22f6c709 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ClosureBinderImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForBinderImpl.qll
@@ -1,19 +1,19 @@
-// generated by codegen, remove this comment if you wish to edit this file
 /**
- * This module provides a hand-modifiable wrapper around the generated class `ClosureBinder`.
+ * This module provides a hand-modifiable wrapper around the generated class `ForBinder`.
  *
  * INTERNAL: Do not use.
  */
 
-private import codeql.rust.elements.internal.generated.ClosureBinder
+private import codeql.rust.elements.internal.generated.ForBinder
 
 /**
- * INTERNAL: This module contains the customizable definition of `ClosureBinder` and should not
+ * INTERNAL: This module contains the customizable definition of `ForBinder` and should not
  * be referenced directly.
  */
 module Impl {
+  // the following QLdoc is generated: if you need to edit it, do it in the schema file
   /**
-   * A closure binder, specifying lifetime or type parameters for a closure.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
    *
    * For example:
    * ```rust
@@ -26,5 +26,7 @@ module Impl {
    * print_any("hello");
    * ```
    */
-  class ClosureBinder extends Generated::ClosureBinder { }
+  class ForBinder extends Generated::ForBinder {
+    override string toStringImpl() { result = "for<...>" }
+  }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
index f555c6649636..409c0d94c94f 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/ForTypeReprImpl.qll
@@ -13,17 +13,12 @@ private import codeql.rust.elements.internal.generated.ForTypeRepr
  */
 module Impl {
   /**
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class ForTypeRepr extends Generated::ForTypeRepr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
index 60030dd6f278..289e6c33a307 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroBlockExprImpl.qll
@@ -15,9 +15,15 @@ module Impl {
   /**
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    */
   class MacroBlockExpr extends Generated::MacroBlockExpr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
index 27f70c77074c..0ed4d3073f05 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/MacroCallImpl.qll
@@ -19,6 +19,8 @@ module Impl {
     or
     n = root.(Adt).getDeriveMacroExpansion(_)
     or
+    n = root.(Item).getAttributeMacroExpansion()
+    or
     isInMacroExpansion(root, n.getParentNode())
   }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
deleted file mode 100644
index 893708164d80..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/ResolvableImpl.qll
+++ /dev/null
@@ -1,19 +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 `Resolvable`.
- *
- * INTERNAL: Do not use.
- */
-
-private import codeql.rust.elements.internal.generated.Resolvable
-
-/**
- * INTERNAL: This module contains the customizable definition of `Resolvable` and should not
- * be referenced directly.
- */
-module Impl {
-  /**
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   */
-  class Resolvable extends Generated::Resolvable { }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
index 4e45ed845bd5..5cbeb62c7a4a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/StructExprImpl.qll
@@ -20,8 +20,8 @@ module Impl {
    * ```rust
    * let first = Foo { a: 1, b: 2 };
    * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = second;
    * ```
    */
   class StructExpr extends Generated::StructExpr {
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
index eead8bd32ef6..df818859d879 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TupleExprImpl.qll
@@ -15,8 +15,9 @@ module Impl {
   /**
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    */
   class TupleExpr extends Generated::TupleExpr { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
index c4b70217db2a..5dd87536a03e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeBoundImpl.qll
@@ -19,6 +19,8 @@ module Impl {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class TypeBound extends Generated::TypeBound { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
index 753f511dedb6..cf057831a4fd 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/TypeParamImpl.qll
@@ -28,18 +28,6 @@ module Impl {
     /** Gets the position of this type parameter. */
     int getPosition() { this = any(GenericParamList l).getTypeParam(result) }
 
-    private TypeBound getTypeBoundAt(int i, int j) {
-      exists(TypeBoundList tbl | result = tbl.getBound(j) |
-        tbl = this.getTypeBoundList() and i = 0
-        or
-        exists(WherePred wp |
-          wp = this.(TypeParamItemNode).getAWherePred() and
-          tbl = wp.getTypeBoundList() and
-          wp = any(WhereClause wc).getPredicate(i)
-        )
-      )
-    }
-
     /**
      * Gets the `index`th type bound of this type parameter, if any.
      *
@@ -47,7 +35,8 @@ module Impl {
      * any `where` clauses for this type parameter.
      */
     TypeBound getTypeBound(int index) {
-      result = rank[index + 1](int i, int j | | this.getTypeBoundAt(i, j) order by i, j)
+      result =
+        rank[index + 1](int i, int j | | this.(TypeParamItemNode).getTypeBoundAt(i, j) order by i, j)
     }
 
     /**
@@ -56,12 +45,7 @@ module Impl {
      * This includes type bounds directly on this type parameter and bounds from
      * any `where` clauses for this type parameter.
      */
-    TypeBound getATypeBound() {
-      // NOTE: This predicate is used in path resolution, so it can not be
-      // defined using `getTypeBound` as that would cause non-monotonic
-      // recursion due to the `rank`.
-      result = this.getTypeBoundAt(_, _)
-    }
+    TypeBound getATypeBound() { result = this.getTypeBound(_) }
 
     override string toAbbreviatedString() { result = this.getName().getText() }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
index 9f77b9c3c69d..9e4231ec5154 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/WherePredImpl.qll
@@ -19,6 +19,8 @@ module Impl {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class WherePred extends Generated::WherePred { }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
index 9d4ba1e976a3..b51d8b1ec6a7 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Addressable.qll
@@ -20,39 +20,5 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::Addressable` class directly.
    * Use the subclass `Addressable`, where the following predicates are available.
    */
-  class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode {
-    /**
-     * Gets the extended canonical path of this addressable, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     * INTERNAL: Do not use.
-     */
-    string getExtendedCanonicalPath() {
-      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getExtendedCanonicalPath()
-    }
-
-    /**
-     * Holds if `getExtendedCanonicalPath()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasExtendedCanonicalPath() { exists(this.getExtendedCanonicalPath()) }
-
-    /**
-     * Gets the crate origin of this addressable, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
-     * INTERNAL: Do not use.
-     */
-    string getCrateOrigin() {
-      result = Synth::convertAddressableToRaw(this).(Raw::Addressable).getCrateOrigin()
-    }
-
-    /**
-     * Holds if `getCrateOrigin()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasCrateOrigin() { exists(this.getCrateOrigin()) }
-  }
+  class Addressable extends Synth::TAddressable, AstNodeImpl::AstNode { }
 }
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
index 83f756a4c984..95e4d08aa406 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/AsmExpr.qll
@@ -10,6 +10,7 @@ import codeql.rust.elements.AsmPiece
 import codeql.rust.elements.Attr
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.internal.ItemImpl::Impl as ItemImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `AsmExpr` and should not
@@ -27,7 +28,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::AsmExpr` class directly.
    * Use the subclass `AsmExpr`, where the following predicates are available.
    */
-  class AsmExpr extends Synth::TAsmExpr, ExprImpl::Expr {
+  class AsmExpr extends Synth::TAsmExpr, ExprImpl::Expr, ItemImpl::Item {
     override string getAPrimaryQlClass() { result = "AsmExpr" }
 
     /**
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
index 70a3c374e0d1..99e494a60006 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureExpr.qll
@@ -7,9 +7,9 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.CallableImpl::Impl as CallableImpl
-import codeql.rust.elements.ClosureBinder
 import codeql.rust.elements.Expr
 import codeql.rust.elements.internal.ExprImpl::Impl as ExprImpl
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.RetTypeRepr
 
 /**
@@ -23,10 +23,13 @@ module Generated {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    * INTERNAL: Do not reference the `Generated::ClosureExpr` class directly.
    * Use the subclass `ClosureExpr`, where the following predicates are available.
@@ -48,19 +51,19 @@ module Generated {
     final predicate hasBody() { exists(this.getBody()) }
 
     /**
-     * Gets the closure binder of this closure expression, if it exists.
+     * Gets the for binder of this closure expression, if it exists.
      */
-    ClosureBinder getClosureBinder() {
+    ForBinder getForBinder() {
       result =
-        Synth::convertClosureBinderFromRaw(Synth::convertClosureExprToRaw(this)
+        Synth::convertForBinderFromRaw(Synth::convertClosureExprToRaw(this)
               .(Raw::ClosureExpr)
-              .getClosureBinder())
+              .getForBinder())
     }
 
     /**
-     * Holds if `getClosureBinder()` exists.
+     * Holds if `getForBinder()` exists.
      */
-    final predicate hasClosureBinder() { exists(this.getClosureBinder()) }
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Holds if this closure expression is async.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
similarity index 58%
rename from rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
rename to rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
index 9bd04fd35817..38512084e395 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ClosureBinder.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForBinder.qll
@@ -1,6 +1,6 @@
 // generated by codegen, do not edit
 /**
- * This module provides the generated definition of `ClosureBinder`.
+ * This module provides the generated definition of `ForBinder`.
  * INTERNAL: Do not import directly.
  */
 
@@ -10,12 +10,12 @@ import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.GenericParamList
 
 /**
- * INTERNAL: This module contains the fully generated definition of `ClosureBinder` and should not
+ * INTERNAL: This module contains the fully generated definition of `ForBinder` and should not
  * be referenced directly.
  */
 module Generated {
   /**
-   * A closure binder, specifying lifetime or type parameters for a closure.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
    *
    * For example:
    * ```rust
@@ -27,19 +27,19 @@ module Generated {
    * print_any(42);
    * print_any("hello");
    * ```
-   * INTERNAL: Do not reference the `Generated::ClosureBinder` class directly.
-   * Use the subclass `ClosureBinder`, where the following predicates are available.
+   * INTERNAL: Do not reference the `Generated::ForBinder` class directly.
+   * Use the subclass `ForBinder`, where the following predicates are available.
    */
-  class ClosureBinder extends Synth::TClosureBinder, AstNodeImpl::AstNode {
-    override string getAPrimaryQlClass() { result = "ClosureBinder" }
+  class ForBinder extends Synth::TForBinder, AstNodeImpl::AstNode {
+    override string getAPrimaryQlClass() { result = "ForBinder" }
 
     /**
-     * Gets the generic parameter list of this closure binder, if it exists.
+     * Gets the generic parameter list of this for binder, if it exists.
      */
     GenericParamList getGenericParamList() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertClosureBinderToRaw(this)
-              .(Raw::ClosureBinder)
+        Synth::convertGenericParamListFromRaw(Synth::convertForBinderToRaw(this)
+              .(Raw::ForBinder)
               .getGenericParamList())
     }
 
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
index cbe2975bf509..56745b56f009 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ForTypeRepr.qll
@@ -6,7 +6,7 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
 
@@ -16,17 +16,12 @@ import codeql.rust.elements.internal.TypeReprImpl::Impl as TypeReprImpl
  */
 module Generated {
   /**
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::ForTypeRepr` class directly.
    * Use the subclass `ForTypeRepr`, where the following predicates are available.
@@ -35,19 +30,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "ForTypeRepr" }
 
     /**
-     * Gets the generic parameter list of this for type representation, if it exists.
+     * Gets the for binder of this for type representation, if it exists.
      */
-    GenericParamList getGenericParamList() {
+    ForBinder getForBinder() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertForTypeReprToRaw(this)
+        Synth::convertForBinderFromRaw(Synth::convertForTypeReprToRaw(this)
               .(Raw::ForTypeRepr)
-              .getGenericParamList())
+              .getForBinder())
     }
 
     /**
-     * Holds if `getGenericParamList()` exists.
+     * Holds if `getForBinder()` exists.
      */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Gets the type representation of this for type representation, if it exists.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
index 3dd6411e20e8..e7b94d9f04cc 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MacroBlockExpr.qll
@@ -18,9 +18,15 @@ module Generated {
   /**
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    * INTERNAL: Do not reference the `Generated::MacroBlockExpr` class directly.
    * Use the subclass `MacroBlockExpr`, where the following predicates are available.
@@ -28,21 +34,6 @@ module Generated {
   class MacroBlockExpr extends Synth::TMacroBlockExpr, ExprImpl::Expr {
     override string getAPrimaryQlClass() { result = "MacroBlockExpr" }
 
-    /**
-     * Gets the tail expression of this macro block expression, if it exists.
-     */
-    Expr getTailExpr() {
-      result =
-        Synth::convertExprFromRaw(Synth::convertMacroBlockExprToRaw(this)
-              .(Raw::MacroBlockExpr)
-              .getTailExpr())
-    }
-
-    /**
-     * Holds if `getTailExpr()` exists.
-     */
-    final predicate hasTailExpr() { exists(this.getTailExpr()) }
-
     /**
      * Gets the `index`th statement of this macro block expression (0-based).
      */
@@ -62,5 +53,20 @@ module Generated {
      * Gets the number of statements of this macro block expression.
      */
     final int getNumberOfStatements() { result = count(int i | exists(this.getStatement(i))) }
+
+    /**
+     * Gets the tail expression of this macro block expression, if it exists.
+     */
+    Expr getTailExpr() {
+      result =
+        Synth::convertExprFromRaw(Synth::convertMacroBlockExprToRaw(this)
+              .(Raw::MacroBlockExpr)
+              .getTailExpr())
+    }
+
+    /**
+     * Holds if `getTailExpr()` exists.
+     */
+    final predicate hasTailExpr() { exists(this.getTailExpr()) }
   }
 }
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 116488ae6ef1..8908b71b7aff 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/MethodCallExpr.qll
@@ -10,7 +10,6 @@ import codeql.rust.elements.internal.CallExprBaseImpl::Impl as CallExprBaseImpl
 import codeql.rust.elements.Expr
 import codeql.rust.elements.GenericArgList
 import codeql.rust.elements.NameRef
-import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `MethodCallExpr` and should not
@@ -26,9 +25,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::MethodCallExpr` class directly.
    * Use the subclass `MethodCallExpr`, where the following predicates are available.
    */
-  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase,
-    ResolvableImpl::Resolvable
-  {
+  class MethodCallExpr extends Synth::TMethodCallExpr, CallExprBaseImpl::CallExprBase {
     override string getAPrimaryQlClass() { result = "MethodCallExpr" }
 
     /**
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 e2aa343f65d9..6d2ab30fc68e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/ParentChild.qll
@@ -152,22 +152,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfClosureBinder(
-    ClosureBinder e, int index, string partialPredicateCall
-  ) {
-    exists(int n, int nGenericParamList |
-      n = 0 and
-      nGenericParamList = n + 1 and
-      (
-        none()
-        or
-        index = n and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfExternItemList(
     ExternItemList e, int index, string partialPredicateCall
   ) {
@@ -187,6 +171,20 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfForBinder(ForBinder e, int index, string partialPredicateCall) {
+    exists(int n, int nGenericParamList |
+      n = 0 and
+      nGenericParamList = n + 1 and
+      (
+        none()
+        or
+        index = n and
+        result = e.getGenericParamList() and
+        partialPredicateCall = "GenericParamList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfFormatArgsArg(
     FormatArgsArg e, int index, string partialPredicateCall
   ) {
@@ -656,15 +654,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfTypeBound(TypeBound e, int index, string partialPredicateCall) {
-    exists(int n, int nLifetime, int nTypeRepr, int nUseBoundGenericArgs |
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nUseBoundGenericArgs |
       n = 0 and
-      nLifetime = n + 1 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
       nTypeRepr = nLifetime + 1 and
       nUseBoundGenericArgs = nTypeRepr + 1 and
       (
         none()
         or
-        index = n and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
+        or
+        index = nForBinder and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
         index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
@@ -781,22 +782,18 @@ private module Impl {
   }
 
   private Element getImmediateChildOfWherePred(WherePred e, int index, string partialPredicateCall) {
-    exists(int n, int nGenericParamList, int nLifetime, int nTypeRepr, int nTypeBoundList |
+    exists(int n, int nForBinder, int nLifetime, int nTypeRepr, int nTypeBoundList |
       n = 0 and
-      nGenericParamList = n + 1 and
-      nLifetime = nGenericParamList + 1 and
+      nForBinder = n + 1 and
+      nLifetime = nForBinder + 1 and
       nTypeRepr = nLifetime + 1 and
       nTypeBoundList = nTypeRepr + 1 and
       (
         none()
         or
-        index = n and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nGenericParamList and
-        result = e.getLifetime() and
-        partialPredicateCall = "Lifetime()"
+        index = nForBinder and result = e.getLifetime() and partialPredicateCall = "Lifetime()"
         or
         index = nLifetime and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
         or
@@ -863,27 +860,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nAsmPiece, int nAttr, int nTemplate |
-      n = 0 and
-      nAsmPiece = n + 1 + max(int i | i = -1 or exists(e.getAsmPiece(i)) | i) and
-      nAttr = nAsmPiece + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
-      nTemplate = nAttr + 1 + max(int i | i = -1 or exists(e.getTemplate(i)) | i) and
-      (
-        none()
-        or
-        result = e.getAsmPiece(index - n) and
-        partialPredicateCall = "AsmPiece(" + (index - n).toString() + ")"
-        or
-        result = e.getAttr(index - nAsmPiece) and
-        partialPredicateCall = "Attr(" + (index - nAsmPiece).toString() + ")"
-        or
-        result = e.getTemplate(index - nAttr) and
-        partialPredicateCall = "Template(" + (index - nAttr).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfAsmLabel(AsmLabel e, int index, string partialPredicateCall) {
     exists(int n, int nBlockExpr |
       n = 0 and
@@ -1116,13 +1092,13 @@ private module Impl {
   private Element getImmediateChildOfClosureExpr(
     ClosureExpr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nParamList, int nAttr, int nBody, int nClosureBinder, int nRetType |
+    exists(int n, int nParamList, int nAttr, int nBody, int nForBinder, int nRetType |
       n = 0 and
       nParamList = n + 1 and
       nAttr = nParamList + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
       nBody = nAttr + 1 and
-      nClosureBinder = nBody + 1 and
-      nRetType = nClosureBinder + 1 and
+      nForBinder = nBody + 1 and
+      nRetType = nForBinder + 1 and
       (
         none()
         or
@@ -1133,9 +1109,9 @@ private module Impl {
         or
         index = nAttr and result = e.getBody() and partialPredicateCall = "Body()"
         or
-        index = nBody and result = e.getClosureBinder() and partialPredicateCall = "ClosureBinder()"
+        index = nBody and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nClosureBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
+        index = nForBinder and result = e.getRetType() and partialPredicateCall = "RetType()"
       )
     )
   }
@@ -1278,20 +1254,16 @@ private module Impl {
   private Element getImmediateChildOfForTypeRepr(
     ForTypeRepr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nGenericParamList, int nTypeRepr |
+    exists(int n, int nForBinder, int nTypeRepr |
       n = 0 and
-      nGenericParamList = n + 1 and
-      nTypeRepr = nGenericParamList + 1 and
+      nForBinder = n + 1 and
+      nTypeRepr = nForBinder + 1 and
       (
         none()
         or
-        index = n and
-        result = e.getGenericParamList() and
-        partialPredicateCall = "GenericParamList()"
+        index = n and result = e.getForBinder() and partialPredicateCall = "ForBinder()"
         or
-        index = nGenericParamList and
-        result = e.getTypeRepr() and
-        partialPredicateCall = "TypeRepr()"
+        index = nForBinder and result = e.getTypeRepr() and partialPredicateCall = "TypeRepr()"
       )
     )
   }
@@ -1517,17 +1489,17 @@ private module Impl {
   private Element getImmediateChildOfMacroBlockExpr(
     MacroBlockExpr e, int index, string partialPredicateCall
   ) {
-    exists(int n, int nTailExpr, int nStatement |
+    exists(int n, int nStatement, int nTailExpr |
       n = 0 and
-      nTailExpr = n + 1 and
-      nStatement = nTailExpr + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nStatement = n + 1 + max(int i | i = -1 or exists(e.getStatement(i)) | i) and
+      nTailExpr = nStatement + 1 and
       (
         none()
         or
-        index = n and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
+        result = e.getStatement(index - n) and
+        partialPredicateCall = "Statement(" + (index - n).toString() + ")"
         or
-        result = e.getStatement(index - nTailExpr) and
-        partialPredicateCall = "Statement(" + (index - nTailExpr).toString() + ")"
+        index = nStatement and result = e.getTailExpr() and partialPredicateCall = "TailExpr()"
       )
     )
   }
@@ -1697,6 +1669,18 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPath |
+      n = 0 and
+      nPath = n + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfPathTypeRepr(
     PathTypeRepr e, int index, string partialPredicateCall
   ) {
@@ -1898,6 +1882,23 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
+    exists(int n, int nPath, int nStructExprFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructExprFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and
+        result = e.getStructExprFieldList() and
+        partialPredicateCall = "StructExprFieldList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfStructFieldList(
     StructFieldList e, int index, string partialPredicateCall
   ) {
@@ -1913,6 +1914,23 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfStructPat(StructPat e, int index, string partialPredicateCall) {
+    exists(int n, int nPath, int nStructPatFieldList |
+      n = 0 and
+      nPath = n + 1 and
+      nStructPatFieldList = nPath + 1 and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        index = nPath and
+        result = e.getStructPatFieldList() and
+        partialPredicateCall = "StructPatFieldList()"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTryExpr(TryExpr e, int index, string partialPredicateCall) {
     exists(int n, int nAttr, int nExpr |
       n = 0 and
@@ -1974,6 +1992,24 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfTupleStructPat(
+    TupleStructPat e, int index, string partialPredicateCall
+  ) {
+    exists(int n, int nPath, int nField |
+      n = 0 and
+      nPath = n + 1 and
+      nField = nPath + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
+      (
+        none()
+        or
+        index = n and result = e.getPath() and partialPredicateCall = "Path()"
+        or
+        result = e.getField(index - nPath) and
+        partialPredicateCall = "Field(" + (index - nPath).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfTupleTypeRepr(
     TupleTypeRepr e, int index, string partialPredicateCall
   ) {
@@ -2147,6 +2183,32 @@ private module Impl {
     )
   }
 
+  private Element getImmediateChildOfAsmExpr(AsmExpr e, int index, string partialPredicateCall) {
+    exists(int n, int nAttributeMacroExpansion, int nAsmPiece, int nAttr, int nTemplate |
+      n = 0 and
+      nAttributeMacroExpansion = n + 1 and
+      nAsmPiece = nAttributeMacroExpansion + 1 + max(int i | i = -1 or exists(e.getAsmPiece(i)) | i) and
+      nAttr = nAsmPiece + 1 + max(int i | i = -1 or exists(e.getAttr(i)) | i) and
+      nTemplate = nAttr + 1 + max(int i | i = -1 or exists(e.getTemplate(i)) | i) and
+      (
+        none()
+        or
+        index = n and
+        result = e.getAttributeMacroExpansion() and
+        partialPredicateCall = "AttributeMacroExpansion()"
+        or
+        result = e.getAsmPiece(index - nAttributeMacroExpansion) and
+        partialPredicateCall = "AsmPiece(" + (index - nAttributeMacroExpansion).toString() + ")"
+        or
+        result = e.getAttr(index - nAsmPiece) and
+        partialPredicateCall = "Attr(" + (index - nAsmPiece).toString() + ")"
+        or
+        result = e.getTemplate(index - nAttr) and
+        partialPredicateCall = "Template(" + (index - nAttr).toString() + ")"
+      )
+    )
+  }
+
   private Element getImmediateChildOfBlockExpr(BlockExpr e, int index, string partialPredicateCall) {
     exists(int n, int nLabel, int nAttr, int nStmtList |
       n = 0 and
@@ -2435,52 +2497,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfPathPat(PathPat e, int index, string partialPredicateCall) {
-    exists(int n, int nPath |
-      n = 0 and
-      nPath = n + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfStructExpr(StructExpr e, int index, string partialPredicateCall) {
-    exists(int n, int nPath, int nStructExprFieldList |
-      n = 0 and
-      nPath = n + 1 and
-      nStructExprFieldList = nPath + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        index = nPath and
-        result = e.getStructExprFieldList() and
-        partialPredicateCall = "StructExprFieldList()"
-      )
-    )
-  }
-
-  private Element getImmediateChildOfStructPat(StructPat e, int index, string partialPredicateCall) {
-    exists(int n, int nPath, int nStructPatFieldList |
-      n = 0 and
-      nPath = n + 1 and
-      nStructPatFieldList = nPath + 1 and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        index = nPath and
-        result = e.getStructPatFieldList() and
-        partialPredicateCall = "StructPatFieldList()"
-      )
-    )
-  }
-
   private Element getImmediateChildOfTrait(Trait e, int index, string partialPredicateCall) {
     exists(
       int n, int nAttributeMacroExpansion, int nAssocItemList, int nAttr, int nGenericParamList,
@@ -2570,24 +2586,6 @@ private module Impl {
     )
   }
 
-  private Element getImmediateChildOfTupleStructPat(
-    TupleStructPat e, int index, string partialPredicateCall
-  ) {
-    exists(int n, int nPath, int nField |
-      n = 0 and
-      nPath = n + 1 and
-      nField = nPath + 1 + max(int i | i = -1 or exists(e.getField(i)) | i) and
-      (
-        none()
-        or
-        index = n and result = e.getPath() and partialPredicateCall = "Path()"
-        or
-        result = e.getField(index - nPath) and
-        partialPredicateCall = "Field(" + (index - nPath).toString() + ")"
-      )
-    )
-  }
-
   private Element getImmediateChildOfUse(Use e, int index, string partialPredicateCall) {
     exists(int n, int nAttributeMacroExpansion, int nAttr, int nUseTree, int nVisibility |
       n = 0 and
@@ -3067,10 +3065,10 @@ private module Impl {
     or
     result = getImmediateChildOfAttr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfClosureBinder(e, index, partialAccessor)
-    or
     result = getImmediateChildOfExternItemList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfForBinder(e, index, partialAccessor)
+    or
     result = getImmediateChildOfFormatArgsArg(e, index, partialAccessor)
     or
     result = getImmediateChildOfGenericArgList(e, index, partialAccessor)
@@ -3153,8 +3151,6 @@ private module Impl {
     or
     result = getImmediateChildOfAsmConst(e, index, partialAccessor)
     or
-    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
-    or
     result = getImmediateChildOfAsmLabel(e, index, partialAccessor)
     or
     result = getImmediateChildOfAsmOperandNamed(e, index, partialAccessor)
@@ -3253,6 +3249,8 @@ private module Impl {
     or
     result = getImmediateChildOfParenTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfPathPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfPathTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfPrefixExpr(e, index, partialAccessor)
@@ -3279,8 +3277,12 @@ private module Impl {
     or
     result = getImmediateChildOfSliceTypeRepr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfStructFieldList(e, index, partialAccessor)
     or
+    result = getImmediateChildOfStructPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTryExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTupleExpr(e, index, partialAccessor)
@@ -3289,6 +3291,8 @@ private module Impl {
     or
     result = getImmediateChildOfTuplePat(e, index, partialAccessor)
     or
+    result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
+    or
     result = getImmediateChildOfTupleTypeRepr(e, index, partialAccessor)
     or
     result = getImmediateChildOfTypeArg(e, index, partialAccessor)
@@ -3309,6 +3313,8 @@ private module Impl {
     or
     result = getImmediateChildOfArrayRepeatExpr(e, index, partialAccessor)
     or
+    result = getImmediateChildOfAsmExpr(e, index, partialAccessor)
+    or
     result = getImmediateChildOfBlockExpr(e, index, partialAccessor)
     or
     result = getImmediateChildOfCallExpr(e, index, partialAccessor)
@@ -3331,18 +3337,10 @@ private module Impl {
     or
     result = getImmediateChildOfPathExpr(e, index, partialAccessor)
     or
-    result = getImmediateChildOfPathPat(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)
     or
-    result = getImmediateChildOfTupleStructPat(e, index, partialAccessor)
-    or
     result = getImmediateChildOfUse(e, index, partialAccessor)
     or
     result = getImmediateChildOfConst(e, index, partialAccessor)
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
index a69957e75450..b250b94ef9aa 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/PathAstNode.qll
@@ -6,8 +6,8 @@
 
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
+import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
 import codeql.rust.elements.Path
-import codeql.rust.elements.internal.ResolvableImpl::Impl as ResolvableImpl
 
 /**
  * INTERNAL: This module contains the fully generated definition of `PathAstNode` and should not
@@ -19,7 +19,7 @@ module Generated {
    * INTERNAL: Do not reference the `Generated::PathAstNode` class directly.
    * Use the subclass `PathAstNode`, where the following predicates are available.
    */
-  class PathAstNode extends Synth::TPathAstNode, ResolvableImpl::Resolvable {
+  class PathAstNode extends Synth::TPathAstNode, AstNodeImpl::AstNode {
     /**
      * Gets the path of this path ast node, 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 a8e526e52639..abf844b77f5a 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Raw.qll
@@ -138,23 +138,7 @@ module Raw {
    *
    * TODO: This does not yet include all possible cases.
    */
-  class Addressable extends @addressable, AstNode {
-    /**
-     * Gets the extended canonical path of this addressable, if it exists.
-     *
-     * Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-     * or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-     * addressable there-in).
-     */
-    string getExtendedCanonicalPath() { addressable_extended_canonical_paths(this, result) }
-
-    /**
-     * Gets the crate origin of this addressable, if it exists.
-     *
-     * One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.
-     */
-    string getCrateOrigin() { addressable_crate_origins(this, result) }
-  }
+  class Addressable extends @addressable, AstNode { }
 
   /**
    * INTERNAL: Do not use.
@@ -319,30 +303,6 @@ module Raw {
     Attr getAttr(int index) { callable_attrs(this, index, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A closure binder, specifying lifetime or type parameters for a closure.
-   *
-   * For example:
-   * ```rust
-   * let print_any = for<T: std::fmt::Debug> |x: T| {
-   * //              ^^^^^^^^^^^^^^^^^^^^^^^
-   *     println!("{:?}", x);
-   * };
-   *
-   * print_any(42);
-   * print_any("hello");
-   * ```
-   */
-  class ClosureBinder extends @closure_binder, AstNode {
-    override string toString() { result = "ClosureBinder" }
-
-    /**
-     * Gets the generic parameter list of this closure binder, if it exists.
-     */
-    GenericParamList getGenericParamList() { closure_binder_generic_param_lists(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * The base class for expressions.
@@ -389,6 +349,30 @@ module Raw {
    */
   class FieldList extends @field_list, AstNode { }
 
+  /**
+   * INTERNAL: Do not use.
+   * A for binder, specifying lifetime or type parameters for a closure or a type.
+   *
+   * For example:
+   * ```rust
+   * let print_any = for<T: std::fmt::Debug> |x: T| {
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^
+   *     println!("{:?}", x);
+   * };
+   *
+   * print_any(42);
+   * print_any("hello");
+   * ```
+   */
+  class ForBinder extends @for_binder, AstNode {
+    override string toString() { result = "ForBinder" }
+
+    /**
+     * Gets the generic parameter list of this for binder, if it exists.
+     */
+    GenericParamList getGenericParamList() { for_binder_generic_param_lists(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A FormatArgsArg. For example the `"world"` in:
@@ -803,6 +787,17 @@ module Raw {
     PathSegment getSegment() { path_segments_(this, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
+   */
+  class PathAstNode extends @path_ast_node, AstNode {
+    /**
+     * Gets the path of this path ast node, if it exists.
+     */
+    Path getPath() { path_ast_node_paths(this, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A path segment, which is one part of a whole path.
@@ -873,22 +868,6 @@ module Raw {
     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 resolved path of this resolvable, if it exists.
-     */
-    string getResolvedPath() { resolvable_resolved_paths(this, result) }
-
-    /**
-     * Gets the resolved crate origin of this resolvable, if it exists.
-     */
-    string getResolvedCrateOrigin() { resolvable_resolved_crate_origins(this, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A return type in a function signature.
@@ -1204,11 +1183,18 @@ module Raw {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class TypeBound extends @type_bound, AstNode {
     override string toString() { result = "TypeBound" }
 
+    /**
+     * Gets the for binder of this type bound, if it exists.
+     */
+    ForBinder getForBinder() { type_bound_for_binders(this, result) }
+
     /**
      * Holds if this type bound is async.
      */
@@ -1409,15 +1395,17 @@ module Raw {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class WherePred extends @where_pred, AstNode {
     override string toString() { result = "WherePred" }
 
     /**
-     * Gets the generic parameter list of this where pred, if it exists.
+     * Gets the for binder of this where pred, if it exists.
      */
-    GenericParamList getGenericParamList() { where_pred_generic_param_lists(this, result) }
+    ForBinder getForBinder() { where_pred_for_binders(this, result) }
 
     /**
      * Gets the lifetime of this where pred, if it exists.
@@ -1521,35 +1509,6 @@ module Raw {
     predicate isConst() { asm_const_is_const(this) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * An inline assembly expression. For example:
-   * ```rust
-   * unsafe {
-   *     #[inline(always)]
-   *     builtin # asm("cmp {0}, {1}", in(reg) a, in(reg) b);
-   * }
-   * ```
-   */
-  class AsmExpr extends @asm_expr, Expr {
-    override string toString() { result = "AsmExpr" }
-
-    /**
-     * Gets the `index`th asm piece of this asm expression (0-based).
-     */
-    AsmPiece getAsmPiece(int index) { asm_expr_asm_pieces(this, index, result) }
-
-    /**
-     * Gets the `index`th attr of this asm expression (0-based).
-     */
-    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
-
-    /**
-     * Gets the `index`th template of this asm expression (0-based).
-     */
-    Expr getTemplate(int index) { asm_expr_templates(this, index, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A label in an inline assembly block.
@@ -1926,10 +1885,13 @@ module Raw {
    * |x| x + 1;
    * move |x: i32| -> i32 { x + 1 };
    * async |x: i32, y| x + y;
-   *  #[coroutine]
+   * #[coroutine]
    * |x| yield x;
-   *  #[coroutine]
-   *  static |x| yield x;
+   * #[coroutine]
+   * static |x| yield x;
+   * for<T: std::fmt::Debug> |x: T| {
+   *     println!("{:?}", x);
+   * };
    * ```
    */
   class ClosureExpr extends @closure_expr, Expr, Callable {
@@ -1941,9 +1903,9 @@ module Raw {
     Expr getBody() { closure_expr_bodies(this, result) }
 
     /**
-     * Gets the closure binder of this closure expression, if it exists.
+     * Gets the for binder of this closure expression, if it exists.
      */
-    ClosureBinder getClosureBinder() { closure_expr_closure_binders(this, result) }
+    ForBinder getForBinder() { closure_expr_for_binders(this, result) }
 
     /**
      * Holds if this closure expression is async.
@@ -2221,26 +2183,21 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * A higher-ranked trait bound.
+   * A function pointer type with a `for` modifier.
    *
    * For example:
    * ```rust
-   * fn foo<T>(value: T)
-   * where
-   *     T: for<'a> Fn(&'a str) -> &'a str
-   * //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-   * {
-   *     // ...
-   * }
+   * type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+   * //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    */
   class ForTypeRepr extends @for_type_repr, TypeRepr {
     override string toString() { result = "ForTypeRepr" }
 
     /**
-     * Gets the generic parameter list of this for type representation, if it exists.
+     * Gets the for binder of this for type representation, if it exists.
      */
-    GenericParamList getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
+    ForBinder getForBinder() { for_type_repr_for_binders(this, result) }
 
     /**
      * Gets the type representation of this for type representation, if it exists.
@@ -2641,23 +2598,29 @@ module Raw {
    * INTERNAL: Do not use.
    * A sequence of statements generated by a `MacroCall`. For example:
    * ```rust
-   * fn main() {
-   *     println!("Hello, world!"); // This macro expands into a list of statements
+   * macro_rules! my_macro {
+   *     () => {
+   *         let mut x = 40;
+   *         x += 2;
+   *         x
+   *     };
    * }
+   *
+   * my_macro!();  // this macro expands to a sequence of statements (and an expression)
    * ```
    */
   class MacroBlockExpr extends @macro_block_expr, Expr {
     override string toString() { result = "MacroBlockExpr" }
 
     /**
-     * Gets the tail expression of this macro block expression, if it exists.
+     * Gets the `index`th statement of this macro block expression (0-based).
      */
-    Expr getTailExpr() { macro_block_expr_tail_exprs(this, result) }
+    Stmt getStatement(int index) { macro_block_expr_statements(this, index, result) }
 
     /**
-     * Gets the `index`th statement of this macro block expression (0-based).
+     * Gets the tail expression of this macro block expression, if it exists.
      */
-    Stmt getStatement(int index) { macro_block_expr_statements(this, index, result) }
+    Expr getTailExpr() { macro_block_expr_tail_exprs(this, result) }
   }
 
   /**
@@ -2920,20 +2883,23 @@ module Raw {
 
   /**
    * INTERNAL: Do not use.
-   * An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
+   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
    */
-  class PathAstNode extends @path_ast_node, Resolvable {
-    /**
-     * Gets the path of this path ast node, if it exists.
-     */
-    Path getPath() { path_ast_node_paths(this, result) }
-  }
+  class PathExprBase extends @path_expr_base, Expr { }
 
   /**
    * INTERNAL: Do not use.
-   * A path expression or a variable access in a formatting template. See `PathExpr` and `FormatTemplateVariableAccess` for further details.
+   * A path pattern. For example:
+   * ```rust
+   * match x {
+   *     Foo::Bar => "ok",
+   *     _ => "fail",
+   * }
+   * ```
    */
-  class PathExprBase extends @path_expr_base, Expr { }
+  class PathPat extends @path_pat, Pat, PathAstNode {
+    override string toString() { result = "PathPat" }
+  }
 
   /**
    * INTERNAL: Do not use.
@@ -3293,6 +3259,27 @@ module Raw {
     TypeRepr getTypeRepr() { slice_type_repr_type_reprs(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 };
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = 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 list of fields in a struct declaration.
@@ -3312,6 +3299,25 @@ module Raw {
     StructField getField(int index) { struct_field_list_fields(this, index, 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 try expression using the `?` operator.
@@ -3340,8 +3346,9 @@ module Raw {
    * INTERNAL: Do not use.
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    */
   class TupleExpr extends @tuple_expr, Expr {
@@ -3394,6 +3401,26 @@ module Raw {
     Pat getField(int index) { tuple_pat_fields(this, index, result) }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * A tuple struct pattern. For example:
+   * ```rust
+   * match x {
+   *     Tuple("a", 1, 2, 3) => "great",
+   *     Tuple(.., 3) => "fine",
+   *     Tuple(..) => "fail",
+   * };
+   * ```
+   */
+  class TupleStructPat extends @tuple_struct_pat, Pat, PathAstNode {
+    override string toString() { result = "TupleStructPat" }
+
+    /**
+     * Gets the `index`th field of this tuple struct pattern (0-based).
+     */
+    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * A tuple type.
@@ -3592,6 +3619,35 @@ module Raw {
     }
   }
 
+  /**
+   * INTERNAL: Do not use.
+   * An inline assembly expression. For example:
+   * ```rust
+   * unsafe {
+   *     #[inline(always)]
+   *     builtin # asm("cmp {0}, {1}", in(reg) a, in(reg) b);
+   * }
+   * ```
+   */
+  class AsmExpr extends @asm_expr, Expr, Item {
+    override string toString() { result = "AsmExpr" }
+
+    /**
+     * Gets the `index`th asm piece of this asm expression (0-based).
+     */
+    AsmPiece getAsmPiece(int index) { asm_expr_asm_pieces(this, index, result) }
+
+    /**
+     * Gets the `index`th attr of this asm expression (0-based).
+     */
+    Attr getAttr(int index) { asm_expr_attrs(this, index, result) }
+
+    /**
+     * Gets the `index`th template of this asm expression (0-based).
+     */
+    Expr getTemplate(int index) { asm_expr_templates(this, index, result) }
+  }
+
   /**
    * INTERNAL: Do not use.
    * An associated item in a `Trait` or `Impl`.
@@ -3923,7 +3979,7 @@ module Raw {
    * x.foo::<u32, u64>(42);
    * ```
    */
-  class MethodCallExpr extends @method_call_expr, CallExprBase, Resolvable {
+  class MethodCallExpr extends @method_call_expr, CallExprBase {
     override string toString() { result = "MethodCallExpr" }
 
     /**
@@ -3997,60 +4053,6 @@ module Raw {
     Attr getAttr(int index) { path_expr_attrs(this, index, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A path pattern. For example:
-   * ```rust
-   * match x {
-   *     Foo::Bar => "ok",
-   *     _ => "fail",
-   * }
-   * ```
-   */
-  class PathPat extends @path_pat, Pat, PathAstNode {
-    override string toString() { result = "PathPat" }
-  }
-
-  /**
-   * 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:
@@ -4156,26 +4158,6 @@ module Raw {
     WhereClause getWhereClause() { trait_alias_where_clauses(this, result) }
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * A tuple struct pattern. For example:
-   * ```rust
-   * match x {
-   *     Tuple("a", 1, 2, 3) => "great",
-   *     Tuple(.., 3) => "fine",
-   *     Tuple(..) => "fail",
-   * };
-   * ```
-   */
-  class TupleStructPat extends @tuple_struct_pat, Pat, PathAstNode {
-    override string toString() { result = "TupleStructPat" }
-
-    /**
-     * Gets the `index`th field of this tuple struct pattern (0-based).
-     */
-    Pat getField(int index) { tuple_struct_pat_fields(this, index, result) }
-  }
-
   /**
    * INTERNAL: Do not use.
    * A `use` statement. For example:
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
deleted file mode 100644
index fb0d7975cf9b..000000000000
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Resolvable.qll
+++ /dev/null
@@ -1,52 +0,0 @@
-// generated by codegen, do not edit
-/**
- * This module provides the generated definition of `Resolvable`.
- * 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 `Resolvable` and should not
- * be referenced directly.
- */
-module Generated {
-  /**
-   * One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-   * INTERNAL: Do not reference the `Generated::Resolvable` class directly.
-   * Use the subclass `Resolvable`, where the following predicates are available.
-   */
-  class Resolvable extends Synth::TResolvable, AstNodeImpl::AstNode {
-    /**
-     * Gets the resolved path of this resolvable, if it exists.
-     *
-     * INTERNAL: Do not use.
-     */
-    string getResolvedPath() {
-      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedPath()
-    }
-
-    /**
-     * Holds if `getResolvedPath()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasResolvedPath() { exists(this.getResolvedPath()) }
-
-    /**
-     * Gets the resolved crate origin of this resolvable, if it exists.
-     *
-     * INTERNAL: Do not use.
-     */
-    string getResolvedCrateOrigin() {
-      result = Synth::convertResolvableToRaw(this).(Raw::Resolvable).getResolvedCrateOrigin()
-    }
-
-    /**
-     * Holds if `getResolvedCrateOrigin()` exists.
-     * INTERNAL: Do not use.
-     */
-    final predicate hasResolvedCrateOrigin() { exists(this.getResolvedCrateOrigin()) }
-  }
-}
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
index c4da706e2777..c9fbacd72686 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/StructExpr.qll
@@ -20,8 +20,8 @@ module Generated {
    * ```rust
    * let first = Foo { a: 1, b: 2 };
    * let second = Foo { a: 2, ..first };
-   * Foo { a: 1, b: 2 }[2] = 10;
-   * Foo { .. } = second;
+   * let n = Foo { a: 1, b: 2 }.b;
+   * Foo { a: m, .. } = second;
    * ```
    * INTERNAL: Do not reference the `Generated::StructExpr` class directly.
    * Use the subclass `StructExpr`, where the following predicates are available.
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 3d89d74b7e8c..9ed7961f63ce 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/Synth.qll
@@ -130,10 +130,6 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TCastExpr(Raw::CastExpr id) { constructCastExpr(id) } or
-    /**
-     * INTERNAL: Do not use.
-     */
-    TClosureBinder(Raw::ClosureBinder id) { constructClosureBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -202,6 +198,10 @@ module Synth {
      * INTERNAL: Do not use.
      */
     TFnPtrTypeRepr(Raw::FnPtrTypeRepr id) { constructFnPtrTypeRepr(id) } or
+    /**
+     * INTERNAL: Do not use.
+     */
+    TForBinder(Raw::ForBinder id) { constructForBinder(id) } or
     /**
      * INTERNAL: Do not use.
      */
@@ -718,12 +718,12 @@ module Synth {
    */
   class TAstNode =
     TAbi or TAddressable or TArgList or TAsmDirSpec or TAsmOperand or TAsmOperandExpr or
-        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TAttr or TCallable or
-        TClosureBinder or TExpr or TExternItemList or TFieldList or TFormatArgsArg or TGenericArg or
+        TAsmOption or TAsmPiece or TAsmRegSpec or TAssocItemList or TAttr or TCallable or TExpr or
+        TExternItemList or TFieldList or TForBinder or TFormatArgsArg or TGenericArg or
         TGenericArgList or TGenericParam or TGenericParamList or TItemList or TLabel or TLetElse or
         TMacroItems or TMatchArm or TMatchArmList or TMatchGuard or TMeta or TName or TParamBase or
-        TParamList or TParenthesizedArgList or TPat or TPath or TPathSegment or TRename or
-        TResolvable or TRetTypeRepr or TReturnTypeSyntax or TSourceFile or TStmt or TStmtList or
+        TParamList or TParenthesizedArgList or TPat or TPath or TPathAstNode or TPathSegment or
+        TRename 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
@@ -774,8 +774,8 @@ module Synth {
    * INTERNAL: Do not use.
    */
   class TItem =
-    TAdt or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or TMacroDef or
-        TMacroRules or TModule or TTrait or TTraitAlias or TUse;
+    TAdt or TAsmExpr or TAssocItem or TExternBlock or TExternCrate or TExternItem or TImpl or
+        TMacroDef or TMacroRules or TModule or TTrait or TTraitAlias or TUse;
 
   /**
    * INTERNAL: Do not use.
@@ -815,11 +815,6 @@ module Synth {
    */
   class TPathExprBase = TFormatTemplateVariableAccess or TPathExpr;
 
-  /**
-   * INTERNAL: Do not use.
-   */
-  class TResolvable = TMethodCallExpr or TPathAstNode;
-
   /**
    * INTERNAL: Do not use.
    */
@@ -1024,12 +1019,6 @@ module Synth {
    */
   TCastExpr convertCastExprFromRaw(Raw::Element e) { result = TCastExpr(e) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw element to a synthesized `TClosureBinder`, if possible.
-   */
-  TClosureBinder convertClosureBinderFromRaw(Raw::Element e) { result = TClosureBinder(e) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TClosureExpr`, if possible.
@@ -1132,6 +1121,12 @@ module Synth {
    */
   TFnPtrTypeRepr convertFnPtrTypeReprFromRaw(Raw::Element e) { result = TFnPtrTypeRepr(e) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a raw element to a synthesized `TForBinder`, if possible.
+   */
+  TForBinder convertForBinderFromRaw(Raw::Element e) { result = TForBinder(e) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a raw element to a synthesized `TForExpr`, if possible.
@@ -1953,14 +1948,14 @@ module Synth {
     or
     result = convertCallableFromRaw(e)
     or
-    result = convertClosureBinderFromRaw(e)
-    or
     result = convertExprFromRaw(e)
     or
     result = convertExternItemListFromRaw(e)
     or
     result = convertFieldListFromRaw(e)
     or
+    result = convertForBinderFromRaw(e)
+    or
     result = convertFormatArgsArgFromRaw(e)
     or
     result = convertGenericArgFromRaw(e)
@@ -1999,12 +1994,12 @@ module Synth {
     or
     result = convertPathFromRaw(e)
     or
+    result = convertPathAstNodeFromRaw(e)
+    or
     result = convertPathSegmentFromRaw(e)
     or
     result = convertRenameFromRaw(e)
     or
-    result = convertResolvableFromRaw(e)
-    or
     result = convertRetTypeReprFromRaw(e)
     or
     result = convertReturnTypeSyntaxFromRaw(e)
@@ -2219,6 +2214,8 @@ module Synth {
   TItem convertItemFromRaw(Raw::Element e) {
     result = convertAdtFromRaw(e)
     or
+    result = convertAsmExprFromRaw(e)
+    or
     result = convertAssocItemFromRaw(e)
     or
     result = convertExternBlockFromRaw(e)
@@ -2352,16 +2349,6 @@ module Synth {
     result = convertPathExprFromRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a raw DB element to a synthesized `TResolvable`, if possible.
-   */
-  TResolvable convertResolvableFromRaw(Raw::Element e) {
-    result = convertMethodCallExprFromRaw(e)
-    or
-    result = convertPathAstNodeFromRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a raw DB element to a synthesized `TStmt`, if possible.
@@ -2610,12 +2597,6 @@ module Synth {
    */
   Raw::Element convertCastExprToRaw(TCastExpr e) { e = TCastExpr(result) }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TClosureBinder` to a raw DB element, if possible.
-   */
-  Raw::Element convertClosureBinderToRaw(TClosureBinder e) { e = TClosureBinder(result) }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TClosureExpr` to a raw DB element, if possible.
@@ -2718,6 +2699,12 @@ module Synth {
    */
   Raw::Element convertFnPtrTypeReprToRaw(TFnPtrTypeRepr e) { e = TFnPtrTypeRepr(result) }
 
+  /**
+   * INTERNAL: Do not use.
+   * Converts a synthesized `TForBinder` to a raw DB element, if possible.
+   */
+  Raw::Element convertForBinderToRaw(TForBinder e) { e = TForBinder(result) }
+
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TForExpr` to a raw DB element, if possible.
@@ -3537,14 +3524,14 @@ module Synth {
     or
     result = convertCallableToRaw(e)
     or
-    result = convertClosureBinderToRaw(e)
-    or
     result = convertExprToRaw(e)
     or
     result = convertExternItemListToRaw(e)
     or
     result = convertFieldListToRaw(e)
     or
+    result = convertForBinderToRaw(e)
+    or
     result = convertFormatArgsArgToRaw(e)
     or
     result = convertGenericArgToRaw(e)
@@ -3583,12 +3570,12 @@ module Synth {
     or
     result = convertPathToRaw(e)
     or
+    result = convertPathAstNodeToRaw(e)
+    or
     result = convertPathSegmentToRaw(e)
     or
     result = convertRenameToRaw(e)
     or
-    result = convertResolvableToRaw(e)
-    or
     result = convertRetTypeReprToRaw(e)
     or
     result = convertReturnTypeSyntaxToRaw(e)
@@ -3803,6 +3790,8 @@ module Synth {
   Raw::Element convertItemToRaw(TItem e) {
     result = convertAdtToRaw(e)
     or
+    result = convertAsmExprToRaw(e)
+    or
     result = convertAssocItemToRaw(e)
     or
     result = convertExternBlockToRaw(e)
@@ -3936,16 +3925,6 @@ module Synth {
     result = convertPathExprToRaw(e)
   }
 
-  /**
-   * INTERNAL: Do not use.
-   * Converts a synthesized `TResolvable` to a raw DB element, if possible.
-   */
-  Raw::Element convertResolvableToRaw(TResolvable e) {
-    result = convertMethodCallExprToRaw(e)
-    or
-    result = convertPathAstNodeToRaw(e)
-  }
-
   /**
    * INTERNAL: Do not use.
    * Converts a synthesized `TStmt` to a raw DB element, if possible.
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 e6ff3af47154..d701fa09d769 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/SynthConstructors.qll
@@ -32,7 +32,6 @@ import codeql.rust.elements.internal.BoxPatConstructor
 import codeql.rust.elements.internal.BreakExprConstructor
 import codeql.rust.elements.internal.CallExprConstructor
 import codeql.rust.elements.internal.CastExprConstructor
-import codeql.rust.elements.internal.ClosureBinderConstructor
 import codeql.rust.elements.internal.ClosureExprConstructor
 import codeql.rust.elements.internal.CommentConstructor
 import codeql.rust.elements.internal.ConstConstructor
@@ -50,6 +49,7 @@ import codeql.rust.elements.internal.ExternItemListConstructor
 import codeql.rust.elements.internal.ExtractorStepConstructor
 import codeql.rust.elements.internal.FieldExprConstructor
 import codeql.rust.elements.internal.FnPtrTypeReprConstructor
+import codeql.rust.elements.internal.ForBinderConstructor
 import codeql.rust.elements.internal.ForExprConstructor
 import codeql.rust.elements.internal.ForTypeReprConstructor
 import codeql.rust.elements.internal.FormatConstructor
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
index 0860831446ba..9a3b414dda0e 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TupleExpr.qll
@@ -18,8 +18,9 @@ module Generated {
   /**
    * A tuple expression. For example:
    * ```rust
-   * (1, "one");
-   * (2, "two")[0] = 3;
+   * let tuple = (1, "one");
+   * let n = (2, "two").0;
+   * let (a, b) = tuple;
    * ```
    * INTERNAL: Do not reference the `Generated::TupleExpr` class directly.
    * Use the subclass `TupleExpr`, where the following predicates are available.
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
index c1e349511be0..958867911ce8 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/TypeBound.qll
@@ -7,6 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeRepr
 import codeql.rust.elements.UseBoundGenericArgs
@@ -23,6 +24,8 @@ module Generated {
    * ```rust
    * fn foo<T: Debug>(t: T) {}
    * //        ^^^^^
+   * fn bar(value: impl for<'a> From<&'a str>) {}
+   * //                 ^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::TypeBound` class directly.
    * Use the subclass `TypeBound`, where the following predicates are available.
@@ -30,6 +33,21 @@ module Generated {
   class TypeBound extends Synth::TTypeBound, AstNodeImpl::AstNode {
     override string getAPrimaryQlClass() { result = "TypeBound" }
 
+    /**
+     * Gets the for binder of this type bound, if it exists.
+     */
+    ForBinder getForBinder() {
+      result =
+        Synth::convertForBinderFromRaw(Synth::convertTypeBoundToRaw(this)
+              .(Raw::TypeBound)
+              .getForBinder())
+    }
+
+    /**
+     * Holds if `getForBinder()` exists.
+     */
+    final predicate hasForBinder() { exists(this.getForBinder()) }
+
     /**
      * Holds if this type bound is async.
      */
diff --git a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
index cd835e33850c..7a96b326f1c2 100644
--- a/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
+++ b/rust/ql/lib/codeql/rust/elements/internal/generated/WherePred.qll
@@ -7,7 +7,7 @@
 private import codeql.rust.elements.internal.generated.Synth
 private import codeql.rust.elements.internal.generated.Raw
 import codeql.rust.elements.internal.AstNodeImpl::Impl as AstNodeImpl
-import codeql.rust.elements.GenericParamList
+import codeql.rust.elements.ForBinder
 import codeql.rust.elements.Lifetime
 import codeql.rust.elements.TypeBoundList
 import codeql.rust.elements.TypeRepr
@@ -24,6 +24,8 @@ module Generated {
    * ```rust
    * fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
    * //                             ^^^^^^^^  ^^^^^^^^
+   * fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+   * //                        ^^^^^^^^^^^^^^^^^^^^^^^^
    * ```
    * INTERNAL: Do not reference the `Generated::WherePred` class directly.
    * Use the subclass `WherePred`, where the following predicates are available.
@@ -32,19 +34,19 @@ module Generated {
     override string getAPrimaryQlClass() { result = "WherePred" }
 
     /**
-     * Gets the generic parameter list of this where pred, if it exists.
+     * Gets the for binder of this where pred, if it exists.
      */
-    GenericParamList getGenericParamList() {
+    ForBinder getForBinder() {
       result =
-        Synth::convertGenericParamListFromRaw(Synth::convertWherePredToRaw(this)
+        Synth::convertForBinderFromRaw(Synth::convertWherePredToRaw(this)
               .(Raw::WherePred)
-              .getGenericParamList())
+              .getForBinder())
     }
 
     /**
-     * Holds if `getGenericParamList()` exists.
+     * Holds if `getForBinder()` exists.
      */
-    final predicate hasGenericParamList() { exists(this.getGenericParamList()) }
+    final predicate hasForBinder() { exists(this.getForBinder()) }
 
     /**
      * Gets the lifetime of this where pred, if it exists.
diff --git a/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml
new file mode 100644
index 000000000000..b8c4cf4e10a8
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/frameworks/asyncstd/fs.model.yml
@@ -0,0 +1,42 @@
+extensions:
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sourceModel
+    data:
+      - ["async_std::fs::read::read", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["async_std::fs::read_to_string::read_to_string", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["async_std::fs::read_link::read_link", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<async_std::fs::dir_entry::DirEntry>::path", "ReturnValue", "file", "manual"]
+      - ["<async_std::fs::dir_entry::DirEntry>::file_name", "ReturnValue", "file", "manual"]
+      - ["<async_std::fs::file::File>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<async_std::fs::open_options::OpenOptions>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["async_std::fs::copy::copy", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::create_dir::create_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::create_dir_all::create_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::hard_link::hard_link", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::metadata::metadata", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read::read", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_dir::read_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_link::read_link", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::read_to_string::read_to_string", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_dir::remove_dir", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_dir_all::remove_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::remove_file::remove_file", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::rename::rename", "Argument[0,1]", "path-injection", "manual"]
+      - ["async_std::fs::set_permissions::set_permissions", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::symlink_metadata::symlink_metadata", "Argument[0]", "path-injection", "manual"]
+      - ["async_std::fs::write::write", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::dir_builder::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::file::File>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::file::File>::open", "Argument[0]", "path-injection", "manual"]
+      - ["<async_std::fs::open_options::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["async_std::fs::canonicalize::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["async_std::fs::canonicalize::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
index 70b92a3f7eaf..51d00f795d7e 100644
--- a/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/rustcrypto/RustCrypto.qll
@@ -5,6 +5,8 @@
 private import rust
 private import codeql.rust.Concepts
 private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.internal.TypeInference
+private import codeql.rust.internal.Type
 
 bindingset[algorithmName]
 private string simplifyAlgorithmName(string algorithmName) {
@@ -21,28 +23,20 @@ class StreamCipherInit extends Cryptography::CryptographicOperation::Range {
 
   StreamCipherInit() {
     // a call to `cipher::KeyInit::new`, `cipher::KeyInit::new_from_slice`,
-    // `cipher::KeyIvInit::new`, `cipher::KeyIvInit::new_from_slices` or `rc2::Rc2::new_with_eff_key_len`.
-    exists(PathExpr p, string rawAlgorithmName |
-      this.asExpr().getExpr().(CallExpr).getFunction() = p and
-      p.getResolvedCrateOrigin().matches("%/RustCrypto%") and
-      p.getPath().getText() = ["new", "new_from_slice", "new_from_slices", "new_with_eff_key_len"] and
-      (
-        rawAlgorithmName = p.getPath().getQualifier().getText() or
+    // `cipher::KeyIvInit::new`, `cipher::KeyIvInit::new_from_slices`, `rc2::Rc2::new_with_eff_key_len` or similar.
+    exists(CallExprBase ce, string rawAlgorithmName |
+      ce = this.asExpr().getExpr() and
+      ce.getStaticTarget().getName().getText() =
+        ["new", "new_from_slice", "new_with_eff_key_len", "new_from_slices"] and
+      // extract the algorithm name from the type of `ce` or its receiver.
+      exists(Type t, TypePath tp |
+        t = inferType([ce, ce.(MethodCallExpr).getReceiver()], tp) and
         rawAlgorithmName =
-          p.getPath()
-              .getQualifier()
-              .getSegment()
-              .getGenericArgList()
-              .getGenericArg(0)
-              .(TypeArg)
-              .getTypeRepr()
-              .(PathTypeRepr)
-              .getPath()
-              .getSegment()
-              .getIdentifier()
-              .getText()
+          t.(StructType).asItemNode().(Addressable).getCanonicalPath().splitAt("::")
       ) and
-      algorithmName = simplifyAlgorithmName(rawAlgorithmName)
+      algorithmName = simplifyAlgorithmName(rawAlgorithmName) and
+      // only match a known cryptographic algorithm
+      any(Cryptography::CryptographicAlgorithm alg).matchesName(algorithmName)
     )
   }
 
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
index 114163efc9cf..728c632759cd 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/Stdlib.qll
@@ -94,6 +94,16 @@ class RangeToStruct extends Struct {
   StructField getEnd() { result = this.getStructField("end") }
 }
 
+/**
+ * The [`RangeFull` struct][1].
+ *
+ * [1]: https://doc.rust-lang.org/core/ops/struct.RangeFull.html
+ */
+class RangeFullStruct extends Struct {
+  pragma[nomagic]
+  RangeFullStruct() { this.getCanonicalPath() = "core::ops::range::RangeFull" }
+}
+
 /**
  * The [`RangeInclusive` struct][1].
  *
diff --git a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
index 346b4dbc722d..848bb22a5baf 100644
--- a/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/stdlib/fs.model.yml
@@ -10,16 +10,15 @@ extensions:
       - ["<std::fs::DirEntry>::file_name", "ReturnValue", "file", "manual"]
       - ["<std::fs::File>::open", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
       - ["<std::fs::File>::open_buffered", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<std::fs::OpenOptions>::open", "ReturnValue.Field[core::result::Result::Ok(0)]", "file", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: sinkModel
     data:
-      - ["std::fs::copy", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::copy", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::copy", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::create_dir", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::create_dir_all", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::hard_link", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::hard_link", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::hard_link", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::metadata", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::read", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::read_dir", "Argument[0]", "path-injection", "manual"]
@@ -28,11 +27,9 @@ extensions:
       - ["std::fs::remove_dir", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::remove_dir_all", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::remove_file", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::rename", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::rename", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::rename", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::set_permissions", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::soft_link", "Argument[0]", "path-injection", "manual"]
-      - ["std::fs::soft_link", "Argument[1]", "path-injection", "manual"]
+      - ["std::fs::soft_link", "Argument[0,1]", "path-injection", "manual"]
       - ["std::fs::symlink_metadata", "Argument[0]", "path-injection", "manual"]
       - ["std::fs::write", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
@@ -41,12 +38,34 @@ extensions:
       - ["<std::fs::File>::create_new", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::File>::open", "Argument[0]", "path-injection", "manual"]
       - ["<std::fs::File>::open_buffered", "Argument[0]", "path-injection", "manual"]
+      - ["<std::fs::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
   - addsTo:
       pack: codeql/rust-all
       extensible: summaryModel
     data:
-      - ["<std::path::PathBuf as core::convert::From>::from", "Argument[0]", "ReturnValue", "taint", "manual"]
+      - ["std::fs::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["std::fs::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::PathBuf as core::convert::From>::from", "Argument[0]", "ReturnValue", "value", "manual"]
+      - ["<std::path::PathBuf>::as_path", "Argument[Self]", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::PathBuf>::as_mut_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::PathBuf>::into_os_string", "Argument[Self]", "ReturnValue", "value", "manual"]
+      - ["<std::path::PathBuf>::into_boxed_path", "Argument[Self]", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::new", "Argument[0].Reference", "ReturnValue.Reference", "value", "manual"]
       - ["<std::path::Path>::join", "Argument[self]", "ReturnValue", "taint", "manual"]
       - ["<std::path::Path>::join", "Argument[0]", "ReturnValue", "taint", "manual"]
-      - ["<std::path::Path>::canonicalize", "Argument[self].OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
-      - ["<std::path::Path>::canonicalize", "Argument[self].OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::as_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::as_mut_os_string", "Argument[Self].Reference", "ReturnValue.Reference", "value", "manual"]
+      - ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalStep[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::canonicalize", "Argument[self].Reference.OptionalBarrier[normalize-path]", "ReturnValue.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["<std::path::Path>::extension", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_name", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_prefix", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::file_stem", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::into_path_buf", "Argument[Self].Reference", "ReturnValue", "value", "manual"]
+      - ["<std::path::Path>::parent", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "taint", "manual"]
+      - ["<std::path::Path>::to_path_buf", "Argument[Self].Reference", "ReturnValue", "value", "manual"]
+      - ["<std::path::Path>::to_str", "Argument[Self].Reference", "ReturnValue.Field[core::option::Option::Some(0)].Reference", "value", "manual"]
+      - ["<std::path::Path>::with_added_extension", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_extension", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_file_name", "Argument[Self].Reference", "ReturnValue", "taint", "manual"]
+      - ["<std::path::Path>::with_file_name", "Argument[0]", "ReturnValue", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml b/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
index 8fe76763dd5c..f2b41988fc09 100644
--- a/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
+++ b/rust/ql/lib/codeql/rust/frameworks/tokio/fs.model.yml
@@ -9,3 +9,39 @@ extensions:
       - ["<tokio::fs::read_dir::DirEntry>::path", "ReturnValue", "file", "manual"]
       - ["<tokio::fs::read_dir::DirEntry>::file_name", "ReturnValue", "file", "manual"]
       - ["<tokio::fs::file::File>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+      - ["<tokio::fs::open_options::OpenOptions>::open", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "file", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: sinkModel
+    data:
+      - ["tokio::fs::copy::copy", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::create_dir::create_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::create_dir_all::create_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::hard_link::hard_link", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::metadata::metadata", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read::read", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_dir::read_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_link::read_link", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::read_to_string::read_to_string", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_dir::remove_dir", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_dir_all::remove_dir_all", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::remove_file::remove_file", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::rename::rename", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::set_permissions::set_permissions", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::symlink::symlink", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_dir::symlink_dir", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_file::symlink_file", "Argument[0,1]", "path-injection", "manual"]
+      - ["tokio::fs::symlink_metadata::symlink_metadata", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::try_exists::try_exists", "Argument[0]", "path-injection", "manual"]
+      - ["tokio::fs::write::write", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::dir_builder::DirBuilder>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::create", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::create_new", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::file::File>::open", "Argument[0]", "path-injection", "manual"]
+      - ["<tokio::fs::open_options::OpenOptions>::open", "Argument[0]", "path-injection", "manual"]
+  - addsTo:
+      pack: codeql/rust-all
+      extensible: summaryModel
+    data:
+      - ["tokio::fs::canonicalize::canonicalize", "Argument[0].OptionalStep[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
+      - ["tokio::fs::canonicalize::canonicalize", "Argument[0].OptionalBarrier[normalize-path]", "ReturnValue.Future.Field[core::result::Result::Ok(0)]", "taint", "manual"]
diff --git a/rust/ql/lib/codeql/rust/internal/CachedStages.qll b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
index ad011a753c89..c2dc21661783 100644
--- a/rust/ql/lib/codeql/rust/internal/CachedStages.qll
+++ b/rust/ql/lib/codeql/rust/internal/CachedStages.qll
@@ -120,9 +120,7 @@ module Stages {
       or
       exists(resolvePath(_))
       or
-      exists(any(ItemNode i).getASuccessor(_))
-      or
-      exists(any(ItemNode i).getASuccessorRec(_))
+      exists(any(ItemNode i).getASuccessor(_, _))
       or
       exists(any(ImplOrTraitItemNode i).getASelfPath())
       or
diff --git a/rust/ql/lib/codeql/rust/internal/Definitions.qll b/rust/ql/lib/codeql/rust/internal/Definitions.qll
index c03ece9d56de..b1b3e475c468 100644
--- a/rust/ql/lib/codeql/rust/internal/Definitions.qll
+++ b/rust/ql/lib/codeql/rust/internal/Definitions.qll
@@ -135,10 +135,10 @@ private class PositionalFormatArgumentUse extends Use instanceof PositionalForma
   override string getUseType() { result = "format argument" }
 }
 
-private class PathUse extends Use instanceof PathSegment {
+private class PathUse extends Use instanceof NameRef {
   private Path path;
 
-  PathUse() { this = path.getSegment() }
+  PathUse() { this = path.getSegment().getIdentifier() }
 
   private CallExpr getCall() { result.getFunction().(PathExpr).getPath() = path }
 
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolution.qll b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
index 354cab5a6de9..77faaa747b96 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolution.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolution.qll
@@ -32,24 +32,102 @@ final class Namespace extends TNamespace {
   }
 }
 
+private newtype TSuccessorKind =
+  TInternal() or
+  TExternal() or
+  TBoth()
+
+/** A successor kind. */
+class SuccessorKind extends TSuccessorKind {
+  predicate isInternal() { this = TInternal() }
+
+  predicate isExternal() { this = TExternal() }
+
+  predicate isBoth() { this = TBoth() }
+
+  predicate isInternalOrBoth() { this.isInternal() or this.isBoth() }
+
+  predicate isExternalOrBoth() { this.isExternal() or this.isBoth() }
+
+  string toString() {
+    this.isInternal() and result = "internal"
+    or
+    this.isExternal() and result = "external"
+    or
+    this.isBoth() and result = "both"
+  }
+}
+
+pragma[nomagic]
+private ItemNode getAChildSuccessor(ItemNode item, string name, SuccessorKind kind) {
+  item = result.getImmediateParent() and
+  name = result.getName() and
+  (
+    // type parameters are only available inside the declaring item
+    if result instanceof TypeParam
+    then kind.isInternal()
+    else
+      // associated items must always be qualified, also within the declaring
+      // item (using `Self`)
+      if item instanceof ImplOrTraitItemNode and result instanceof AssocItem
+      then kind.isExternal()
+      else
+        if result instanceof Use
+        then kind.isInternal()
+        else kind.isBoth()
+  )
+}
+
 /**
  * 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
+ *
+ * ```
+ * item1 --name,kind--> item2
+ * ```
+ *
+ * means that:
+ *
+ * - `item2` is available _inside_ the scope of `item1` under the name `name`,
+ *   when `kind` is either `internal` or `both`, and
+ *
+ * - `item2` is available _externally_ from `item1` under the name `name`, when
+ *   `kind` is either `external` or `both`.
+ *
+ * For example, if we have
  *
  * ```rust
- * mod m1 {
- *     mod m2 { }
+ * pub mod m1 {
+ *     pub mod m2 { }
+ * }
+ * ```
+ *
+ * then there is an edge `mod m1 --m2,both--> mod m2`.
+ *
+ * Associated items are example of externally visible items (inside the
+ * declaring item they must be `Self` prefixed), while type parameters are
+ * examples of internally visible items. For example, for
+ *
+ * ```rust
+ * mod m {
+ *     pub trait<T> Trait {
+ *         fn foo(&self) -> T;
+ *     }
  * }
  * ```
  *
- * then there is an edge `m1 --m2--> m1::m2`.
+ * we have the following edges
+ *
+ * ```
+ * mod m       --Trait,both-->    trait Trait
+ * trait Trait --foo,external --> fn foo
+ * trait Trait --T,internal -->   T
+ * ```
  *
  * 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`
+ * each source file `f` there is an edge `f --name,both--> item` when `f`
  * declares `item` with the name `name`.
  *
  * For imports like
@@ -61,11 +139,13 @@ final class Namespace extends TNamespace {
  * }
  * ```
  *
- * 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`.
+ * we first generate an edge `mod m2 --name,kind--> f::item`, where `item` is
+ * any item (named `name`) inside the imported source file `f`, and `kind` is
+ * either `external` or `both`. Using this edge, `m2::foo` can resolve to
+ * `f::foo`, which results in the edge `use m2 --foo,internal--> f::foo`
+ * (would have been `external` if it was `pub use m2::foo`). Lastly, all edges
+ * out of `use` nodes are lifted to predecessors in the graph, so we get
+ * an edge `mod m1 --foo,internal--> f::foo`.
  *
  *
  * References:
@@ -112,101 +192,88 @@ abstract class ItemNode extends Locatable {
     result = this.(SourceFileItemNode).getSuper()
   }
 
-  pragma[nomagic]
-  private ItemNode getAChildSuccessor(string name) {
-    this = result.getImmediateParent() and
-    name = result.getName()
-  }
-
+  /** Gets a successor named `name` of the given `kind`, if any. */
   cached
-  ItemNode getASuccessorRec(string name) {
+  ItemNode getASuccessor(string name, SuccessorKind kind) {
     Stages::PathResolutionStage::ref() and
-    sourceFileEdge(this, name, result)
+    sourceFileEdge(this, name, result) and
+    kind.isBoth()
     or
-    result = this.getAChildSuccessor(name)
+    result = getAChildSuccessor(this, name, kind)
     or
-    fileImportEdge(this, name, result)
+    fileImportEdge(this, name, result, kind)
     or
-    useImportEdge(this, name, result)
+    useImportEdge(this, name, result, kind)
     or
-    crateDefEdge(this, name, result)
+    crateDefEdge(this, name, result, kind)
     or
-    crateDependencyEdge(this, name, result)
+    crateDependencyEdge(this, name, result) and
+    kind.isInternal()
     or
-    externCrateEdge(this, name, result)
+    externCrateEdge(this, name, result) and
+    kind.isInternal()
     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)
+      use = this.getASuccessor(_, _) and
+      result = use.getASuccessor(name, kind)
     )
     or
-    exists(ExternCrateItemNode ec | result = ec.(ItemNode).getASuccessorRec(name) |
-      ec = this.getASuccessorRec(_)
+    exists(ExternCrateItemNode ec | result = ec.(ItemNode).getASuccessor(name, kind) |
+      ec = this.getASuccessor(_, _)
       or
       // if the extern crate appears in the crate root, then the crate name is also added
       // to the 'extern prelude', see https://doc.rust-lang.org/reference/items/extern-crates.html
       exists(Crate c |
-        ec = c.getSourceFile().(ItemNode).getASuccessorRec(_) and
+        ec = c.getSourceFile().(ItemNode).getASuccessor(_, _) and
         this = c.getASourceFile()
       )
     )
     or
     // a trait has access to the associated items of its supertraits
     this =
-      any(TraitItemNode trait |
-        result = trait.resolveABound().getASuccessorRec(name) and
+      any(TraitItemNodeImpl trait |
+        result = trait.resolveABoundCand().getASuccessor(name, kind) and
+        kind.isExternalOrBoth() 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 and
-      not result instanceof TypeAlias
-    )
+    typeImplEdge(this, _, name, kind, result)
     or
     // trait items with default implementations made available in an implementation
-    exists(ImplItemNode impl, ItemNode trait |
+    exists(ImplItemNodeImpl impl, ItemNode trait |
       this = impl and
-      trait = impl.resolveTraitTy() and
-      result = trait.getASuccessorRec(name) and
+      trait = impl.resolveTraitTyCand() and
+      result = trait.getASuccessor(name, kind) and
       result.(AssocItemNode).hasImplementation() and
+      kind.isExternalOrBoth() and
       not impl.hasAssocItem(name)
     )
     or
     // type parameters have access to the associated items of its bounds
-    result = this.(TypeParamItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
-    or
-    result = this.(ImplTraitTypeReprItemNode).resolveABound().getASuccessorRec(name).(AssocItemNode)
-    or
-    result = this.(TypeAliasItemNode).resolveAlias().getASuccessorRec(name) and
-    // type parameters defined in the RHS are not available in the LHS
-    not result instanceof TypeParam
-  }
-
-  /**
-   * Gets a successor named `name` of this item, if any.
-   *
-   * Whenever a function exists in both source code and in library code,
-   * both are included
-   */
-  cached
-  ItemNode getASuccessor(string name) {
-    Stages::PathResolutionStage::ref() and
-    result = this.getASuccessorRec(name)
+    result =
+      this.(TypeParamItemNodeImpl).resolveABoundCand().getASuccessor(name, kind).(AssocItemNode) and
+    kind.isExternalOrBoth()
     or
-    preludeEdge(this, name, result)
+    result =
+      this.(ImplTraitTypeReprItemNodeImpl)
+          .resolveABoundCand()
+          .getASuccessor(name, kind)
+          .(AssocItemNode) and
+    kind.isExternalOrBoth()
     or
-    this instanceof SourceFile and
-    builtin(name, result)
+    result = this.(TypeAliasItemNodeImpl).resolveAliasCand().getASuccessor(name, kind) and
+    kind.isExternalOrBoth()
     or
     name = "super" and
     if this instanceof Module or this instanceof SourceFile
-    then result = this.getImmediateParentModule()
-    else result = this.getImmediateParentModule().getImmediateParentModule()
+    then (
+      kind.isBoth() and result = this.getImmediateParentModule()
+    ) else (
+      kind.isInternal() and result = this.getImmediateParentModule().getImmediateParentModule()
+    )
     or
     name = "self" and
     if
@@ -214,51 +281,41 @@ abstract class ItemNode extends Locatable {
       this instanceof Enum or
       this instanceof Struct or
       this instanceof Crate
-    then result = this
-    else result = this.getImmediateParentModule()
-    or
-    name = "Self" and
-    this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
-    or
-    name = "crate" and
-    this = result.(CrateItemNode).getASourceFile()
+    then (
+      kind.isBoth() and
+      result = this
+    ) else (
+      kind.isInternal() and
+      result = this.getImmediateParentModule()
+    )
     or
-    // todo: implement properly
-    name = "$crate" and
-    result = any(CrateItemNode crate | this = crate.getASourceFile()).(Crate).getADependency*() and
-    result.(CrateItemNode).isPotentialDollarCrateTarget()
-  }
-
-  /**
-   * Holds if the successor `item` with the name `name` is not available locally
-   * for unqualified paths.
-   *
-   * This has the effect that a path of the form `name` inside `this` will not
-   * resolve to `item`.
-   */
-  pragma[nomagic]
-  predicate excludedLocally(string name, ItemNode item) {
-    // Associated items in an impl or trait block are not directly available
-    // inside the block, they require a qualified path with a `Self` prefix.
-    item = this.getAChildSuccessor(name) and
-    this instanceof ImplOrTraitItemNode and
-    item instanceof AssocItemNode
+    kind.isInternal() and
+    (
+      preludeEdge(this, name, result)
+      or
+      this instanceof SourceFile and
+      builtin(name, result)
+      or
+      name = "Self" and
+      this = result.(ImplOrTraitItemNode).getAnItemInSelfScope()
+      or
+      name = "crate" and
+      this = result.(CrateItemNode).getASourceFile()
+      or
+      // todo: implement properly
+      name = "$crate" and
+      result = any(CrateItemNode crate | this = crate.getASourceFile()).(Crate).getADependency*() and
+      result.(CrateItemNode).isPotentialDollarCrateTarget()
+    )
   }
 
-  /**
-   * Holds if the successor `item` with the name `name` is not available
-   * externally for qualified paths that resolve to this item.
-   *
-   * This has the effect that a path of the form `Qualifier::name`, where
-   * `Qualifier` resolves to this item, will not resolve to `item`.
-   */
+  /** Gets an _external_ successor named `name`, if any. */
   pragma[nomagic]
-  predicate excludedExternally(string name, ItemNode item) {
-    // Type parameters for an `impl` or trait block are not available outside of
-    // the block.
-    item = this.getAChildSuccessor(name) and
-    this instanceof ImplOrTraitItemNode and
-    item instanceof TypeParamItemNode
+  ItemNode getASuccessor(string name) {
+    exists(SuccessorKind kind |
+      result = this.getASuccessor(name, kind) and
+      kind.isExternalOrBoth()
+    )
   }
 
   /** Holds if this item has a canonical path belonging to the crate `c`. */
@@ -552,7 +609,7 @@ abstract class ImplOrTraitItemNode extends ItemNode {
   Path getASelfPath() {
     Stages::PathResolutionStage::ref() and
     isUnqualifiedSelfPath(result) and
-    this = unqualifiedPathLookup(result, _)
+    this = unqualifiedPathLookup(result, _, _)
   }
 
   /** Gets an associated item belonging to this trait or `impl` block. */
@@ -570,17 +627,12 @@ abstract class ImplOrTraitItemNode extends ItemNode {
   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 {
+final 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()) }
+  TypeItemNode resolveSelfTy() { result = resolvePath(this.getSelfPath()) }
 
   TraitItemNode resolveTraitTy() { result = resolvePath(this.getTraitPath()) }
 
@@ -615,7 +667,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
       if this.hasCanonicalPath(c2)
       then c1 = c2
       else (
-        c2 = c1.getADependency() or c1 = c2.getADependency()
+        c2 = c1.getADependency+() or c1 = c2.getADependency+()
       )
     )
   }
@@ -669,7 +721,7 @@ class ImplItemNode extends ImplOrTraitItemNode instanceof Impl {
   }
 }
 
-private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTypeRepr {
+final private class ImplTraitTypeReprItemNode extends TypeItemNode instanceof ImplTraitTypeRepr {
   pragma[nomagic]
   Path getABoundPath() {
     result = super.getTypeBoundList().getABound().getTypeRepr().(PathTypeRepr).getPath()
@@ -691,6 +743,11 @@ private class ImplTraitTypeReprItemNode extends ItemNode instanceof ImplTraitTyp
   override string getCanonicalPath(Crate c) { none() }
 }
 
+private class ImplTraitTypeReprItemNodeImpl extends ImplTraitTypeReprItemNode {
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPath()) }
+}
+
 private class ModuleItemNode extends ModuleLikeNode instanceof Module {
   override string getName() { result = Module.super.getName().getText() }
 
@@ -733,6 +790,12 @@ private class ModuleItemNode extends ModuleLikeNode instanceof Module {
   }
 }
 
+private class ImplItemNodeImpl extends ImplItemNode {
+  TypeItemNode resolveSelfTyCand() { result = resolvePathCand(this.getSelfPath()) }
+
+  TraitItemNode resolveTraitTyCand() { result = resolvePathCand(this.getTraitPath()) }
+}
+
 private class StructItemNode extends TypeItemNode instanceof Struct {
   override string getName() { result = Struct.super.getName().getText() }
 
@@ -768,7 +831,7 @@ private class StructItemNode extends TypeItemNode instanceof Struct {
   }
 }
 
-class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
+final class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
   pragma[nomagic]
   Path getABoundPath() { result = super.getATypeBound().getTypeRepr().(PathTypeRepr).getPath() }
 
@@ -823,7 +886,12 @@ class TraitItemNode extends ImplOrTraitItemNode, TypeItemNode instanceof Trait {
   }
 }
 
-class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias {
+final private class TraitItemNodeImpl extends TraitItemNode {
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPath()) }
+}
+
+final class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias {
   pragma[nomagic]
   ItemNode resolveAlias() { result = resolvePath(super.getTypeRepr().(PathTypeRepr).getPath()) }
 
@@ -842,6 +910,13 @@ class TypeAliasItemNode extends TypeItemNode, AssocItemNode instanceof TypeAlias
   override string getCanonicalPath(Crate c) { none() }
 }
 
+private class TypeAliasItemNodeImpl extends TypeAliasItemNode instanceof TypeAlias {
+  pragma[nomagic]
+  ItemNode resolveAliasCand() {
+    result = resolvePathCand(super.getTypeRepr().(PathTypeRepr).getPath())
+  }
+}
+
 private class UnionItemNode extends TypeItemNode instanceof Union {
   override string getName() { result = Union.super.getName().getText() }
 
@@ -900,18 +975,35 @@ private class BlockExprItemNode extends ItemNode instanceof BlockExpr {
   override string getCanonicalPath(Crate c) { none() }
 }
 
-class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
+pragma[nomagic]
+private Path getWherePredPath(WherePred wp) { result = wp.getTypeRepr().(PathTypeRepr).getPath() }
+
+final class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
   /** Gets a where predicate for this type parameter, if any */
-  WherePred getAWherePred() {
+  pragma[nomagic]
+  private WherePred getAWherePred() {
     exists(ItemNode declaringItem |
-      this = resolveTypeParamPathTypeRepr(result.getTypeRepr()) and
+      this = resolvePath(getWherePredPath(result)) and
       result = declaringItem.getADescendant() and
       this = declaringItem.getADescendant()
     )
   }
 
   pragma[nomagic]
-  Path getABoundPath() { result = super.getATypeBound().getTypeRepr().(PathTypeRepr).getPath() }
+  TypeBound getTypeBoundAt(int i, int j) {
+    exists(TypeBoundList tbl | result = tbl.getBound(j) |
+      tbl = super.getTypeBoundList() and i = 0
+      or
+      exists(WherePred wp |
+        wp = this.getAWherePred() and
+        tbl = wp.getTypeBoundList() and
+        wp = any(WhereClause wc).getPredicate(i)
+      )
+    )
+  }
+
+  pragma[nomagic]
+  Path getABoundPath() { result = this.getTypeBoundAt(_, _).getTypeRepr().(PathTypeRepr).getPath() }
 
   pragma[nomagic]
   ItemNode resolveABound() { result = resolvePath(this.getABoundPath()) }
@@ -959,6 +1051,39 @@ class TypeParamItemNode extends TypeItemNode instanceof TypeParam {
   override string getCanonicalPath(Crate c) { none() }
 }
 
+final private class TypeParamItemNodeImpl extends TypeParamItemNode instanceof TypeParam {
+  /** Gets a where predicate for this type parameter, if any */
+  pragma[nomagic]
+  private WherePred getAWherePredCand() {
+    exists(ItemNode declaringItem |
+      this = resolvePathCand(getWherePredPath(result)) and
+      result = declaringItem.getADescendant() and
+      this = declaringItem.getADescendant()
+    )
+  }
+
+  pragma[nomagic]
+  TypeBound getTypeBoundAtCand(int i, int j) {
+    exists(TypeBoundList tbl | result = tbl.getBound(j) |
+      tbl = super.getTypeBoundList() and i = 0
+      or
+      exists(WherePred wp |
+        wp = this.getAWherePredCand() and
+        tbl = wp.getTypeBoundList() and
+        wp = any(WhereClause wc).getPredicate(i)
+      )
+    )
+  }
+
+  pragma[nomagic]
+  Path getABoundPathCand() {
+    result = this.getTypeBoundAtCand(_, _).getTypeRepr().(PathTypeRepr).getPath()
+  }
+
+  pragma[nomagic]
+  ItemNode resolveABoundCand() { result = resolvePathCand(this.getABoundPathCand()) }
+}
+
 /** 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.(ItemNode).getADescendant() and
@@ -1090,10 +1215,10 @@ predicate fileImport(Module m, SourceFile f) {
  * in scope under the name `name`.
  */
 pragma[nomagic]
-private predicate fileImportEdge(Module mod, string name, ItemNode item) {
+private predicate fileImportEdge(Module mod, string name, ItemNode item, SuccessorKind kind) {
   exists(SourceFileItemNode f |
     fileImport(mod, f) and
-    item = f.getASuccessorRec(name)
+    item = f.getASuccessor(name, kind)
   )
 }
 
@@ -1101,26 +1226,35 @@ private predicate fileImportEdge(Module mod, string name, ItemNode item) {
  * Holds if crate `c` defines the item `i` named `name`.
  */
 pragma[nomagic]
-private predicate crateDefEdge(CrateItemNode c, string name, ItemNode i) {
-  i = c.getSourceFile().getASuccessorRec(name) and
-  not i instanceof Crate
+private predicate crateDefEdge(CrateItemNode c, string name, ItemNode i, SuccessorKind kind) {
+  i = c.getSourceFile().getASuccessor(name, kind) and
+  kind.isExternalOrBoth()
 }
 
 private class BuiltinSourceFile extends SourceFileItemNode {
   BuiltinSourceFile() { this.getFile().getParentContainer() instanceof Builtins::BuiltinsFolder }
 }
 
+pragma[nomagic]
+private predicate crateDependency(SourceFileItemNode file, string name, CrateItemNode dep) {
+  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
+}
+
 /**
  * Holds if `file` depends on crate `dep` named `name`.
  */
 pragma[nomagic]
 private predicate crateDependencyEdge(SourceFileItemNode file, string name, CrateItemNode dep) {
-  exists(CrateItemNode c | dep = c.(Crate).getDependency(name) | file = c.getASourceFile())
+  crateDependency(file, name, dep)
   or
-  // Give builtin files access to `std`
-  file instanceof BuiltinSourceFile and
-  dep.getName() = name and
-  name = "std"
+  // As a fallback, give all files access to crates that do not conflict with known dependencies
+  // and declarations. This is in order to workaround incomplete crate dependency information
+  // provided by the extractor, as well as `CrateItemNode.getASourceFile()` being unable to map
+  // a given file to its crate (for example, if the file is `mod` imported inside a macro that the
+  // extractor is unable to expand).
+  name = dep.getName() and
+  not declaresDirectly(file, TTypeNamespace(), name) and
+  not crateDependency(file, name, _)
 }
 
 private predicate useTreeDeclares(UseTree tree, string name) {
@@ -1140,6 +1274,18 @@ private predicate useTreeDeclares(UseTree tree, string name) {
   )
 }
 
+/**
+ * Holds if `item` explicitly declares a sub item named `name` in the
+ * namespace `ns`. This excludes items declared by `use` statements.
+ */
+pragma[nomagic]
+private predicate declaresDirectly(ItemNode item, Namespace ns, string name) {
+  exists(ItemNode child, SuccessorKind kind | child = getAChildSuccessor(item, name, kind) |
+    child.getNamespace() = ns and
+    kind.isInternalOrBoth()
+  )
+}
+
 /**
  * Holds if `item` explicitly declares a sub item named `name` in the
  * namespace `ns`. This includes items declared by `use` statements,
@@ -1147,12 +1293,10 @@ private predicate useTreeDeclares(UseTree tree, string name) {
  */
 pragma[nomagic]
 private predicate declares(ItemNode item, Namespace ns, string name) {
-  exists(ItemNode child | child.getImmediateParent() = item |
-    child.getName() = name and
-    child.getNamespace() = ns and
-    // If `item` is excluded locally then it does not declare `name`.
-    not item.excludedLocally(name, child)
-    or
+  declaresDirectly(item, ns, name)
+  or
+  exists(ItemNode child |
+    child.getImmediateParent() = item and
     useTreeDeclares(child.(Use).getUseTree(), name) and
     exists(ns) // `use foo::bar` can refer to both a value and a type
   )
@@ -1162,10 +1306,11 @@ private predicate declares(ItemNode item, Namespace ns, string name) {
 class RelevantPath extends Path {
   RelevantPath() { not this = any(VariableAccess va).(PathExpr).getPath() }
 
+  /** Holds if this is an unqualified path with the textual value `name`. */
   pragma[nomagic]
   predicate isUnqualified(string name) {
     not exists(this.getQualifier()) and
-    not this = any(UseTreeList list).getAUseTree().getPath() and
+    not this = any(UseTreeList list).getAUseTree().getPath().getQualifier*() and
     name = this.getText()
   }
 
@@ -1224,8 +1369,8 @@ private predicate unqualifiedPathLookup(ItemNode encl, string name, Namespace ns
 }
 
 pragma[nomagic]
-private ItemNode getASuccessor(ItemNode pred, string name, Namespace ns) {
-  result = pred.getASuccessor(name) and
+private ItemNode getASuccessor(ItemNode pred, string name, Namespace ns, SuccessorKind kind) {
+  result = pred.getASuccessor(name, kind) and
   ns = result.getNamespace()
 }
 
@@ -1258,9 +1403,10 @@ private predicate keywordLookup(ItemNode encl, string name, RelevantPath p) {
 }
 
 pragma[nomagic]
-private ItemNode unqualifiedPathLookup(RelevantPath p, Namespace ns) {
+private ItemNode unqualifiedPathLookup(RelevantPath p, Namespace ns, SuccessorKind kind) {
   exists(ItemNode encl, string name |
-    result = getASuccessor(encl, name, ns) and not encl.excludedLocally(name, result)
+    result = getASuccessor(encl, name, ns, kind) and
+    kind.isInternalOrBoth()
   |
     unqualifiedPathLookup(encl, name, ns, p)
     or
@@ -1271,28 +1417,75 @@ private ItemNode unqualifiedPathLookup(RelevantPath p, Namespace ns) {
 pragma[nomagic]
 private predicate isUnqualifiedSelfPath(RelevantPath path) { path.isUnqualified("Self") }
 
+/** Provides the input to `TraitIsVisible`. */
+signature predicate relevantTraitVisibleSig(Element element, Trait trait);
+
+/**
+ * Provides the `traitIsVisible` predicate for determining if a trait is visible
+ * at a given element.
+ */
+module TraitIsVisible<relevantTraitVisibleSig/2 relevantTraitVisible> {
+  /** Holds if the trait might be looked up in `encl`. */
+  private predicate traitLookup(ItemNode encl, Element element, Trait trait) {
+    // lookup in immediately enclosing item
+    relevantTraitVisible(element, trait) and
+    encl.getADescendant() = element
+    or
+    // lookup in an outer scope, but only if the trait is not declared in inner scope
+    exists(ItemNode mid |
+      traitLookup(mid, element, trait) and
+      not trait = mid.getASuccessor(_, _) and
+      encl = getOuterScope(mid)
+    )
+  }
+
+  /** Holds if the trait `trait` is visible at `element`. */
+  pragma[nomagic]
+  predicate traitIsVisible(Element element, Trait trait) {
+    exists(ItemNode encl | traitLookup(encl, element, trait) and trait = encl.getASuccessor(_, _))
+  }
+}
+
 pragma[nomagic]
-private ItemNode resolvePath0(RelevantPath path, Namespace ns) {
+private ItemNode resolvePathCand0(RelevantPath path, Namespace ns) {
   exists(ItemNode res |
-    res = unqualifiedPathLookup(path, ns) and
+    res = unqualifiedPathLookup(path, ns, _) and
     if
       not any(RelevantPath parent).getQualifier() = path and
       isUnqualifiedSelfPath(path) and
       res instanceof ImplItemNode
-    then result = res.(ImplItemNode).resolveSelfTy()
+    then result = res.(ImplItemNodeImpl).resolveSelfTyCand()
     else result = res
   )
   or
-  exists(ItemNode q, string name |
-    q = resolvePathQualifier(path, name) and
-    result = getASuccessor(q, name, ns) and
-    not q.excludedExternally(name, result)
-  )
+  result = resolvePathCandQualified(_, _, path, ns)
   or
-  result = resolveUseTreeListItem(_, _, path) and
+  result = resolveUseTreeListItem(_, _, path, _) and
   ns = result.getNamespace()
 }
 
+pragma[nomagic]
+private ItemNode resolvePathCandQualifier(RelevantPath qualifier, RelevantPath path, string name) {
+  qualifier = path.getQualifier() and
+  result = resolvePathCand(qualifier) and
+  name = path.getText()
+}
+
+/**
+ * Gets the item that `path` resolves to in `ns` when `qualifier` is the
+ * qualifier of `path` and `qualifier` resolves to `q`, if any.
+ */
+pragma[nomagic]
+private ItemNode resolvePathCandQualified(
+  RelevantPath qualifier, ItemNode q, RelevantPath path, Namespace ns
+) {
+  exists(string name, SuccessorKind kind |
+    q = resolvePathCandQualifier(qualifier, path, name) and
+    result = getASuccessor(q, name, ns, kind) and
+    kind.isExternalOrBoth()
+  )
+}
+
 /** Holds if path `p` must be looked up in namespace `n`. */
 private predicate pathUsesNamespace(Path p, Namespace n) {
   n.isValue() and
@@ -1323,10 +1516,32 @@ private predicate pathUsesNamespace(Path p, Namespace n) {
   )
 }
 
-/** Gets the item that `path` resolves to, if any. */
-cached
-ItemNode resolvePath(RelevantPath path) {
-  exists(Namespace ns | result = resolvePath0(path, ns) |
+/**
+ * Gets an item that `path` may resolve to, if any.
+ *
+ * Unlike `resolvePath`, this predicate does not attempt to make resolution
+ * of qualifiers consistent with resolution of their parents, and should
+ * only be used internally within this library.
+ *
+ * Note that the path resolution logic cannot use `resolvePath`, as that would
+ * result in non-monotonic recursion.
+ */
+pragma[nomagic]
+private ItemNode resolvePathCand(RelevantPath path) {
+  exists(Namespace ns |
+    result = resolvePathCand0(path, ns) and
+    if path = any(ImplItemNode i).getSelfPath()
+    then
+      result instanceof TypeItemNode and
+      not result instanceof TraitItemNode
+    else
+      if path = any(ImplItemNode i).getTraitPath()
+      then result instanceof TraitItemNode
+      else
+        if path = any(PathTypeRepr p).getPath()
+        then result instanceof TypeItemNode
+        else any()
+  |
     pathUsesNamespace(path, ns)
     or
     not pathUsesNamespace(path, _) and
@@ -1334,10 +1549,37 @@ ItemNode resolvePath(RelevantPath path) {
   )
 }
 
-pragma[nomagic]
-private ItemNode resolvePathQualifier(RelevantPath path, string name) {
-  result = resolvePath(path.getQualifier()) and
-  name = path.getText()
+/** Get a trait that should be visible when `path` resolves to `node`, if any. */
+private Trait getResolvePathTraitUsed(RelevantPath path, AssocItemNode node) {
+  exists(TypeItemNode type, ImplItemNodeImpl impl |
+    node = resolvePathCandQualified(_, type, path, _) and
+    typeImplEdge(type, impl, _, _, node) and
+    result = impl.resolveTraitTyCand()
+  )
+}
+
+private predicate pathTraitUsed(Element path, Trait trait) {
+  trait = getResolvePathTraitUsed(path, _)
+}
+
+/** Gets the item that `path` resolves to, if any. */
+cached
+ItemNode resolvePath(RelevantPath path) {
+  result = resolvePathCand(path) and
+  not path = any(Path parent | exists(resolvePathCand(parent))).getQualifier() and
+  (
+    // When the result is an associated item of a trait implementation the
+    // implemented trait must be visible.
+    TraitIsVisible<pathTraitUsed/2>::traitIsVisible(path, getResolvePathTraitUsed(path, result))
+    or
+    not exists(getResolvePathTraitUsed(path, result))
+  )
+  or
+  // if `path` is the qualifier of a resolvable `parent`, then we should
+  // resolve `path` to something consistent with what `parent` resolves to
+  exists(RelevantPath parent |
+    resolvePathCandQualified(path, result, parent, _) = resolvePath(parent)
+  )
 }
 
 private predicate isUseTreeSubPath(UseTree tree, RelevantPath path) {
@@ -1357,17 +1599,20 @@ private predicate isUseTreeSubPathUnqualified(UseTree tree, RelevantPath path, s
 }
 
 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)
+private ItemNode resolveUseTreeListItem(Use use, UseTree tree, RelevantPath path, SuccessorKind kind) {
+  kind.isExternalOrBoth() and
+  (
+    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), kind)
+    )
+    or
+    exists(ItemNode q, string name |
+      q = resolveUseTreeListItemQualifier(use, tree, path, name) and
+      result = q.getASuccessor(name, kind)
+    )
   )
 }
 
@@ -1375,32 +1620,34 @@ pragma[nomagic]
 private ItemNode resolveUseTreeListItemQualifier(
   Use use, UseTree tree, RelevantPath path, string name
 ) {
-  result = resolveUseTreeListItem(use, tree, path.getQualifier()) and
+  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())
+  result = resolvePathCand(tree.getPath())
   or
-  result = resolveUseTreeListItem(use, tree, tree.getPath())
+  result = resolveUseTreeListItem(use, tree, tree.getPath(), _)
 }
 
 /** Holds if `use` imports `item` as `name`. */
 pragma[nomagic]
-private predicate useImportEdge(Use use, string name, ItemNode item) {
+private predicate useImportEdge(Use use, string name, ItemNode item, SuccessorKind kind) {
+  (if use.hasVisibility() then kind.isBoth() else kind.isInternal()) and
   exists(UseTree tree, ItemNode used |
     used = resolveUseTreeListItem(use, tree) and
     not tree.hasUseTreeList() and
     if tree.isGlob()
     then
-      exists(ItemNode encl, Namespace ns |
+      exists(ItemNode encl, Namespace ns, SuccessorKind kind1 |
         encl.getADescendant() = use and
-        item = getASuccessor(used, name, ns) and
+        item = getASuccessor(used, name, ns, kind1) and
+        kind1.isExternalOrBoth() and
         // glob imports can be shadowed
         not declares(encl, ns, name) and
-        not name = ["super", "self", "Self", "$crate", "crate"]
+        not name = ["super", "self"]
       )
     else (
       item = used and
@@ -1408,8 +1655,16 @@ private predicate useImportEdge(Use use, string name, ItemNode item) {
         not tree.hasRename() and
         name = item.getName()
         or
-        name = tree.getRename().getName().getText() and
-        name != "_"
+        exists(Rename rename | rename = tree.getRename() |
+          name = rename.getName().getText()
+          or
+          // When the rename doesn't have a name it's an underscore import. This
+          // makes the imported item visible but unnameable. We represent this
+          // by using the name `_` which can never occur in a path.  See also:
+          // https://doc.rust-lang.org/reference/items/use-declarations.html#r-items.use.as-underscore
+          not rename.hasName() and
+          name = "_"
+        )
       )
     )
   )
@@ -1431,15 +1686,27 @@ private predicate externCrateEdge(ExternCrateItemNode ec, string name, CrateItem
   )
 }
 
+/**
+ * Holds if `typeItem` is the implementing type of `impl` and the implementation
+ * makes `assoc` available as `name` at `kind`.
+ */
+private predicate typeImplEdge(
+  TypeItemNode typeItem, ImplItemNodeImpl impl, string name, SuccessorKind kind, AssocItemNode assoc
+) {
+  typeItem = impl.resolveSelfTyCand() and
+  assoc = impl.getASuccessor(name, kind) and
+  kind.isExternalOrBoth()
+}
+
 pragma[nomagic]
 private predicate preludeItem(string name, ItemNode i) {
   exists(Crate stdOrCore, ModuleLikeNode mod, ModuleItemNode prelude, ModuleItemNode rust |
     stdOrCore.getName() = ["std", "core"] and
     mod = stdOrCore.getSourceFile() and
-    prelude = mod.getASuccessorRec("prelude") and
-    rust = prelude.getASuccessorRec(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
-    i = rust.getASuccessorRec(name) and
-    not i instanceof Use
+    prelude = mod.getASuccessor("prelude") and
+    rust = prelude.getASuccessor(["rust_2015", "rust_2018", "rust_2021", "rust_2024"]) and
+    i = rust.getASuccessor(name) and
+    not name = ["super", "self"]
   )
 }
 
@@ -1456,14 +1723,14 @@ private predicate preludeItem(string name, ItemNode i) {
 pragma[nomagic]
 private predicate preludeEdge(SourceFile f, string name, ItemNode i) {
   preludeItem(name, i) and
-  not declares(f, _, name)
+  not declares(f, i.getNamespace(), name)
 }
 
 pragma[nomagic]
 private predicate builtin(string name, ItemNode i) {
   exists(BuiltinSourceFile builtins |
     builtins.getFile().getBaseName() = "types.rs" and
-    i = builtins.getASuccessorRec(name)
+    i = builtins.getASuccessor(name)
   )
 }
 
@@ -1490,19 +1757,19 @@ private module Debug {
     result = resolvePath(path)
   }
 
-  predicate debugUseImportEdge(Use use, string name, ItemNode item) {
+  predicate debugUseImportEdge(Use use, string name, ItemNode item, SuccessorKind kind) {
     use = getRelevantLocatable() and
-    useImportEdge(use, name, item)
+    useImportEdge(use, name, item, kind)
   }
 
-  ItemNode debugGetASuccessorRec(ItemNode i, string name) {
+  ItemNode debugGetASuccessor(ItemNode i, string name, SuccessorKind kind) {
     i = getRelevantLocatable() and
-    result = i.getASuccessor(name)
+    result = i.getASuccessor(name, kind)
   }
 
-  predicate debugFileImportEdge(Module mod, string name, ItemNode item) {
+  predicate debugFileImportEdge(Module mod, string name, ItemNode item, SuccessorKind kind) {
     mod = getRelevantLocatable() and
-    fileImportEdge(mod, name, item)
+    fileImportEdge(mod, name, item, kind)
   }
 
   predicate debugFileImport(Module m, SourceFile f) {
diff --git a/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
index 9b7131b7a7ff..b16565174e45 100644
--- a/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/PathResolutionConsistency.qll
@@ -19,7 +19,9 @@ query predicate multiplePathResolutions(Path p, ItemNode i) {
     ).getPath() and
   // avoid overlap with `multipleCallTargets` below
   not p = any(CallExpr ce).getFunction().(PathExpr).getPath() and
-  strictcount(resolvePath(p)) > 1
+  // exclude crates when counting: crates can exist in many versions and configurations,
+  // we deliberately want to exhibit them all
+  strictcount(ItemNode i0 | i0 = resolvePath(p) and not i0 instanceof Crate) > 1
 }
 
 /** Holds if `call` has multiple static call targets including `target`. */
diff --git a/rust/ql/lib/codeql/rust/internal/Type.qll b/rust/ql/lib/codeql/rust/internal/Type.qll
index 88eb50e09e38..56c179354b40 100644
--- a/rust/ql/lib/codeql/rust/internal/Type.qll
+++ b/rust/ql/lib/codeql/rust/internal/Type.qll
@@ -82,14 +82,23 @@ abstract class Type extends TType {
   pragma[nomagic]
   abstract TupleField getTupleField(int i);
 
-  /** Gets the `i`th type parameter of this type, if any. */
-  abstract TypeParameter getTypeParameter(int i);
+  /**
+   * Gets the `i`th positional type parameter of this type, if any.
+   *
+   * This excludes synthetic type parameters, such as associated types in traits.
+   */
+  abstract TypeParameter getPositionalTypeParameter(int i);
 
   /** Gets the default type for the `i`th type parameter, if any. */
   TypeMention getTypeParameterDefault(int i) { none() }
 
-  /** Gets a type parameter of this type. */
-  final TypeParameter getATypeParameter() { result = this.getTypeParameter(_) }
+  /**
+   * Gets a type parameter of this type.
+   *
+   * This includes both positional type parameters and synthetic type parameters,
+   * such as associated types in traits.
+   */
+  TypeParameter getATypeParameter() { result = this.getPositionalTypeParameter(_) }
 
   /** Gets a textual representation of this type. */
   abstract string toString();
@@ -108,7 +117,9 @@ class TupleType extends Type, TTuple {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) { result = TTupleTypeParameter(arity, i) }
+  override TypeParameter getPositionalTypeParameter(int i) {
+    result = TTupleTypeParameter(arity, i)
+  }
 
   /** Gets the arity of this tuple type. */
   int getArity() { result = arity }
@@ -141,7 +152,7 @@ class StructType extends StructOrEnumType, TStruct {
 
   override TupleField getTupleField(int i) { result = struct.getTupleField(i) }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(struct.getGenericParamList().getTypeParam(i))
   }
 
@@ -166,7 +177,7 @@ class EnumType extends StructOrEnumType, TEnum {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(enum.getGenericParamList().getTypeParam(i))
   }
 
@@ -192,10 +203,18 @@ class TraitType extends Type, TTrait {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TTypeParamTypeParameter(trait.getGenericParamList().getTypeParam(i))
   }
 
+  override TypeParameter getATypeParameter() {
+    result = super.getATypeParameter()
+    or
+    result.(AssociatedTypeTypeParameter).getTrait() = trait
+    or
+    result.(SelfTypeParameter).getTrait() = trait
+  }
+
   override TypeMention getTypeParameterDefault(int i) {
     result = trait.getGenericParamList().getTypeParam(i).getDefaultType()
   }
@@ -218,7 +237,7 @@ class ArrayType extends Type, TArrayType {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TArrayTypeParameter() and
     i = 0
   }
@@ -241,7 +260,7 @@ class RefType extends Type, TRefType {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TRefTypeParameter() and
     i = 0
   }
@@ -274,7 +293,7 @@ class ImplTraitType extends Type, TImplTraitType {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     exists(TypeParam tp |
       implTraitTypeParam(impl, i, tp) and
       result = TImplTraitTypeParameter(impl, tp)
@@ -295,10 +314,19 @@ class DynTraitType extends Type, TDynTraitType {
 
   override TupleField getTupleField(int i) { none() }
 
-  override DynTraitTypeParameter getTypeParameter(int i) {
+  override DynTraitTypeParameter getPositionalTypeParameter(int i) {
     result = TDynTraitTypeParameter(trait.getGenericParamList().getTypeParam(i))
   }
 
+  override TypeParameter getATypeParameter() {
+    result = super.getATypeParameter()
+    or
+    exists(AstNode n |
+      dynTraitTypeParameter(trait, n) and
+      result = TDynTraitTypeParameter(n)
+    )
+  }
+
   Trait getTrait() { result = trait }
 
   override string toString() { result = "dyn " + trait.getName().toString() }
@@ -336,7 +364,7 @@ class SliceType extends Type, TSliceType {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) {
+  override TypeParameter getPositionalTypeParameter(int i) {
     result = TSliceTypeParameter() and
     i = 0
   }
@@ -352,7 +380,7 @@ abstract class TypeParameter extends Type {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) { none() }
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
 }
 
 private class RawTypeParameter = @type_param or @trait or @type_alias or @impl_trait_type_repr;
@@ -548,7 +576,7 @@ class ImplTraitTypeTypeParameter extends ImplTraitType, TypeParameter {
 
   override TupleField getTupleField(int i) { none() }
 
-  override TypeParameter getTypeParameter(int i) { none() }
+  override TypeParameter getPositionalTypeParameter(int i) { none() }
 }
 
 /**
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
index 07f1180f1bd7..956eb63820aa 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInference.qll
@@ -224,8 +224,9 @@ private import M2
 module Consistency {
   import M2::Consistency
 
-  query predicate nonUniqueCertainType(AstNode n, TypePath path) {
-    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1
+  predicate nonUniqueCertainType(AstNode n, TypePath path, Type t) {
+    strictcount(CertainTypeInference::inferCertainType(n, path)) > 1 and
+    t = CertainTypeInference::inferCertainType(n, path)
   }
 }
 
@@ -323,13 +324,19 @@ private module CertainTypeInference {
       or
       // A `let` statement with a type annotation is a coercion site and hence
       // is not a certain type equality.
-      exists(LetStmt let | not let.hasTypeRepr() |
-        let.getPat() = n1 and
+      exists(LetStmt let |
+        not let.hasTypeRepr() and
+        // Due to "binding modes" the type of the pattern is not necessarily the
+        // same as the type of the initializer. The pattern being an identifier
+        // pattern is sufficient to ensure that this is not the case.
+        let.getPat().(IdentPat) = n1 and
         let.getInitializer() = n2
       )
       or
       exists(LetExpr let |
-        let.getPat() = n1 and
+        // Similarly as for let statements, we need to rule out binding modes
+        // changing the type.
+        let.getPat().(IdentPat) = n1 and
         let.getScrutinee() = n2
       )
       or
@@ -373,6 +380,25 @@ private module CertainTypeInference {
     or
     result = inferLiteralType(n, path, true)
     or
+    result = inferRefNodeType(n) and
+    path.isEmpty()
+    or
+    result = inferLogicalOperationType(n, path)
+    or
+    result = inferRangeExprType(n) and
+    path.isEmpty()
+    or
+    result = inferTupleRootType(n) and
+    path.isEmpty()
+    or
+    result = inferAsyncBlockExprRootType(n) and
+    path.isEmpty()
+    or
+    result = inferArrayExprType(n) and
+    path.isEmpty()
+    or
+    result = inferCastExprType(n, path)
+    or
     infersCertainTypeAt(n, path, result.getATypeParameter())
   }
 
@@ -404,7 +430,7 @@ private module CertainTypeInference {
     inferCertainType(n, path) != t
     or
     // If we infer that `n` has _some_ type at `T1.T2....Tn`, and we also
-    // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `i <=0 < n`,
+    // know that `n` certainly has type `certainType` at `T1.T2...Ti`, `0 <= i < n`,
     // then it must be the case that `T(i+1)` is a type parameter of `certainType`,
     // otherwise there is a conflict.
     //
@@ -419,11 +445,10 @@ private module CertainTypeInference {
 }
 
 private Type inferLogicalOperationType(AstNode n, TypePath path) {
-  exists(Builtins::BuiltinType t, BinaryLogicalOperation be |
+  exists(Builtins::Bool t, BinaryLogicalOperation be |
     n = [be, be.getLhs(), be.getRhs()] and
     path.isEmpty() and
-    result = TStruct(t) and
-    t instanceof Builtins::Bool
+    result = TStruct(t)
   )
 }
 
@@ -441,6 +466,9 @@ private Struct getRangeType(RangeExpr re) {
   re instanceof RangeToExpr and
   result instanceof RangeToStruct
   or
+  re instanceof RangeFullExpr and
+  result instanceof RangeFullStruct
+  or
   re instanceof RangeFromToExpr and
   result instanceof RangeStruct
   or
@@ -471,6 +499,11 @@ private predicate typeEquality(AstNode n1, TypePath prefix1, AstNode n2, TypePat
     or
     n1 = n2.(MatchExpr).getAnArm().getExpr()
     or
+    exists(LetExpr let |
+      n1 = let.getScrutinee() and
+      n2 = let.getPat()
+    )
+    or
     exists(MatchExpr me |
       n1 = me.getScrutinee() and
       n2 = me.getAnArm().getPat()
@@ -1858,7 +1891,7 @@ private predicate methodCandidate(Type type, string name, int arity, Impl impl)
  */
 pragma[nomagic]
 private predicate methodCandidateTrait(Type type, Trait trait, string name, int arity, Impl impl) {
-  trait = resolvePath(impl.(ImplItemNode).getTraitPath()) and
+  trait = impl.(ImplItemNode).resolveTraitTy() and
   methodCandidate(type, name, arity, impl)
 }
 
@@ -1870,19 +1903,53 @@ private predicate isMethodCall(MethodCall mc, Type rootType, string name, int ar
 }
 
 private module IsInstantiationOfInput implements IsInstantiationOfInputSig<MethodCall> {
+  /** Holds if `mc` specifies a trait and might target a method in `impl`. */
   pragma[nomagic]
-  predicate potentialInstantiationOf(MethodCall mc, TypeAbstraction impl, TypeMention constraint) {
+  private predicate methodCallTraitCandidate(MethodCall mc, Impl impl) {
     exists(Type rootType, string name, int arity |
       isMethodCall(mc, rootType, name, arity) and
-      constraint = impl.(ImplTypeAbstraction).getSelfTy()
-    |
       methodCandidateTrait(rootType, mc.getTrait(), name, arity, impl)
-      or
+    )
+  }
+
+  /** Holds if `mc` does not specify a trait and might target a method in `impl`. */
+  pragma[nomagic]
+  private predicate methodCallCandidate(MethodCall mc, Impl impl) {
+    exists(Type rootType, string name, int arity |
       not exists(mc.getTrait()) and
+      isMethodCall(mc, rootType, name, arity) and
       methodCandidate(rootType, name, arity, impl)
     )
   }
 
+  private predicate relevantTraitVisible(Element mc, Trait trait) {
+    trait = any(ImplItemNode impl | methodCallCandidate(mc, impl)).resolveTraitTy()
+  }
+
+  bindingset[impl]
+  pragma[inline_late]
+  private TypeRepr getImplSelfTy(Impl impl) { result = impl.getSelfTy() }
+
+  pragma[nomagic]
+  predicate potentialInstantiationOf(MethodCall mc, TypeAbstraction impl, TypeMention constraint) {
+    constraint = getImplSelfTy(impl) and
+    (
+      methodCallTraitCandidate(mc, impl)
+      or
+      methodCallCandidate(mc, impl) and
+      (
+        not exists(impl.(ImplItemNode).resolveTraitTy())
+        or
+        // If the `impl` block implements a trait, that trait must be visible in
+        // order for the `impl` to be valid.
+        exists(Trait trait |
+          pragma[only_bind_into](trait) = impl.(ImplItemNode).resolveTraitTy() and
+          TraitIsVisible<relevantTraitVisible/2>::traitIsVisible(mc, pragma[only_bind_into](trait))
+        )
+      )
+    )
+  }
+
   predicate relevantTypeMention(TypeMention constraint) {
     exists(Impl impl | methodCandidate(_, _, _, impl) and constraint = impl.getSelfTy())
   }
@@ -2355,8 +2422,6 @@ private module Cached {
     (
       result = inferAnnotatedType(n, path)
       or
-      result = inferLogicalOperationType(n, path)
-      or
       result = inferAssignmentOperationType(n, path)
       or
       result = inferTypeEquality(n, path)
@@ -2365,33 +2430,18 @@ private module Cached {
       or
       result = inferStructExprType(n, path)
       or
-      result = inferTupleRootType(n) and
-      path.isEmpty()
-      or
       result = inferPathExprType(n, path)
       or
       result = inferCallExprBaseType(n, path)
       or
       result = inferFieldExprType(n, path)
       or
-      result = inferRefNodeType(n) and
-      path.isEmpty()
-      or
       result = inferTryExprType(n, path)
       or
       result = inferLiteralType(n, path, false)
       or
-      result = inferAsyncBlockExprRootType(n) and
-      path.isEmpty()
-      or
       result = inferAwaitExprType(n, path)
       or
-      result = inferArrayExprType(n) and
-      path.isEmpty()
-      or
-      result = inferRangeExprType(n) and
-      path.isEmpty()
-      or
       result = inferIndexExprType(n, path)
       or
       result = inferForLoopExprType(n, path)
@@ -2400,8 +2450,6 @@ private module Cached {
       or
       result = inferClosureExprType(n, path)
       or
-      result = inferCastExprType(n, path)
-      or
       result = inferStructPatType(n, path)
       or
       result = inferTupleStructPatType(n, path)
@@ -2513,7 +2561,6 @@ private module Debug {
 
   Type debugInferCertainNonUniqueType(AstNode n, TypePath path) {
     n = getRelevantLocatable() and
-    Consistency::nonUniqueCertainType(n, path) and
-    result = CertainTypeInference::inferCertainType(n, path)
+    Consistency::nonUniqueCertainType(n, path, result)
   }
 }
diff --git a/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
index fd6257fc2602..16eaff92bb6c 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeInferenceConsistency.qll
@@ -17,6 +17,10 @@ query predicate illFormedTypeMention(TypeMention tm) {
   tm.fromSource()
 }
 
+query predicate nonUniqueCertainType(AstNode n, TypePath path) {
+  Consistency::nonUniqueCertainType(n, path, _)
+}
+
 int getTypeInferenceInconsistencyCounts(string type) {
   type = "Missing type parameter ID" and
   result = count(TypeParameter tp | missingTypeParameterId(tp) | tp)
diff --git a/rust/ql/lib/codeql/rust/internal/TypeMention.qll b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
index f7c5f2f25e0e..c36e19842377 100644
--- a/rust/ql/lib/codeql/rust/internal/TypeMention.qll
+++ b/rust/ql/lib/codeql/rust/internal/TypeMention.qll
@@ -182,7 +182,7 @@ class NonAliasPathTypeMention extends PathTypeMention {
   private TypeMention getTypeMentionForTypeParameter(TypeParameter tp) {
     exists(int i |
       result = this.getPositionalTypeArgument(pragma[only_bind_into](i)) and
-      tp = this.resolveRootType().getTypeParameter(pragma[only_bind_into](i))
+      tp = this.resolveRootType().getPositionalTypeParameter(pragma[only_bind_into](i))
     )
     or
     exists(TypeAlias alias |
diff --git a/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
new file mode 100644
index 000000000000..a0282a0ff29f
--- /dev/null
+++ b/rust/ql/lib/codeql/rust/security/LogInjectionExtensions.qll
@@ -0,0 +1,45 @@
+/**
+ * Provides classes and predicates for reasoning about log injection
+ * vulnerabilities.
+ */
+
+import rust
+private import codeql.rust.dataflow.DataFlow
+private import codeql.rust.dataflow.FlowSink
+private import codeql.rust.Concepts
+private import codeql.util.Unit
+
+/**
+ * Provides default sources, sinks and barriers for detecting log injection
+ * vulnerabilities, as well as extension points for adding your own.
+ */
+module LogInjection {
+  /**
+   * A data flow source for log injection vulnerabilities.
+   */
+  abstract class Source extends DataFlow::Node { }
+
+  /**
+   * A data flow sink for log injection vulnerabilities.
+   */
+  abstract class Sink extends QuerySink::Range {
+    override string getSinkType() { result = "LogInjection" }
+  }
+
+  /**
+   * A barrier for log injection vulnerabilities.
+   */
+  abstract class Barrier extends DataFlow::Node { }
+
+  /**
+   * An active threat-model source, considered as a flow source.
+   */
+  private class ActiveThreatModelSourceAsSource extends Source, ActiveThreatModelSource { }
+
+  /**
+   * A sink for log-injection from model data.
+   */
+  private class ModelsAsDataSink extends Sink {
+    ModelsAsDataSink() { sinkNode(this, "log-injection") }
+  }
+}
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 83faa48ad142..a8d8c4597572 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.1.14
+version: 0.1.15
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/lib/rust.dbscheme b/rust/ql/lib/rust.dbscheme
index 319c933d9615..dfade44a27bd 100644
--- a/rust/ql/lib/rust.dbscheme
+++ b/rust/ql/lib/rust.dbscheme
@@ -177,10 +177,10 @@ named_crates(
 | @assoc_item_list
 | @attr
 | @callable
-| @closure_binder
 | @expr
 | @extern_item_list
 | @field_list
+| @for_binder
 | @format_args_arg
 | @generic_arg
 | @generic_arg_list
@@ -200,9 +200,9 @@ named_crates(
 | @parenthesized_arg_list
 | @pat
 | @path
+| @path_ast_node
 | @path_segment
 | @rename
-| @resolvable
 | @ret_type_repr
 | @return_type_syntax
 | @source_file
@@ -282,18 +282,6 @@ abi_abi_strings(
 | @variant
 ;
 
-#keyset[id]
-addressable_extended_canonical_paths(
-  int id: @addressable ref,
-  string extended_canonical_path: string ref
-);
-
-#keyset[id]
-addressable_crate_origins(
-  int id: @addressable ref,
-  string crate_origin: string ref
-);
-
 arg_lists(
   unique int id: @arg_list
 );
@@ -403,16 +391,6 @@ callable_attrs(
   int attr: @attr ref
 );
 
-closure_binders(
-  unique int id: @closure_binder
-);
-
-#keyset[id]
-closure_binder_generic_param_lists(
-  int id: @closure_binder ref,
-  int generic_param_list: @generic_param_list ref
-);
-
 @expr =
   @array_expr_internal
 | @asm_expr
@@ -472,6 +450,16 @@ extern_item_list_extern_items(
 | @tuple_field_list
 ;
 
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
 format_args_args(
   unique int id: @format_args_arg
 );
@@ -747,6 +735,20 @@ path_segments_(
   int segment: @path_segment ref
 );
 
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
 path_segments(
   unique int id: @path_segment
 );
@@ -803,23 +805,6 @@ rename_names(
   int name: @name ref
 );
 
-@resolvable =
-  @method_call_expr
-| @path_ast_node
-;
-
-#keyset[id]
-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
 );
@@ -1044,6 +1029,12 @@ type_bounds(
   unique int id: @type_bound
 );
 
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
 #keyset[id]
 type_bound_is_async(
   int id: @type_bound ref
@@ -1191,9 +1182,9 @@ where_preds(
 );
 
 #keyset[id]
-where_pred_generic_param_lists(
+where_pred_for_binders(
   int id: @where_pred ref,
-  int generic_param_list: @generic_param_list ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1272,31 +1263,6 @@ asm_const_is_const(
   int id: @asm_const ref
 );
 
-asm_exprs(
-  unique int id: @asm_expr
-);
-
-#keyset[id, index]
-asm_expr_asm_pieces(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int asm_piece: @asm_piece ref
-);
-
-#keyset[id, index]
-asm_expr_attrs(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int attr: @attr ref
-);
-
-#keyset[id, index]
-asm_expr_templates(
-  int id: @asm_expr ref,
-  int index: int ref,
-  int template: @expr ref
-);
-
 asm_labels(
   unique int id: @asm_label
 );
@@ -1566,9 +1532,9 @@ closure_expr_bodies(
 );
 
 #keyset[id]
-closure_expr_closure_binders(
+closure_expr_for_binders(
   int id: @closure_expr ref,
-  int closure_binder: @closure_binder ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1769,9 +1735,9 @@ for_type_reprs(
 );
 
 #keyset[id]
-for_type_repr_generic_param_lists(
+for_type_repr_for_binders(
   int id: @for_type_repr ref,
-  int generic_param_list: @generic_param_list ref
+  int for_binder: @for_binder ref
 );
 
 #keyset[id]
@@ -1905,6 +1871,7 @@ infer_type_reprs(
 
 @item =
   @adt
+| @asm_expr
 | @assoc_item
 | @extern_block
 | @extern_crate
@@ -2067,12 +2034,6 @@ macro_block_exprs(
   unique int id: @macro_block_expr
 );
 
-#keyset[id]
-macro_block_expr_tail_exprs(
-  int id: @macro_block_expr ref,
-  int tail_expr: @expr ref
-);
-
 #keyset[id, index]
 macro_block_expr_statements(
   int id: @macro_block_expr ref,
@@ -2080,6 +2041,12 @@ macro_block_expr_statements(
   int statement: @stmt ref
 );
 
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
 macro_exprs(
   unique int id: @macro_expr
 );
@@ -2229,24 +2196,14 @@ paren_type_repr_type_reprs(
   int type_repr: @type_repr ref
 );
 
-@path_ast_node =
+@path_expr_base =
   @path_expr
-| @path_pat
-| @struct_expr
-| @struct_pat
-| @tuple_struct_pat
 ;
 
-#keyset[id]
-path_ast_node_paths(
-  int id: @path_ast_node ref,
-  int path: @path ref
+path_pats(
+  unique int id: @path_pat
 );
 
-@path_expr_base =
-  @path_expr
-;
-
 path_type_reprs(
   unique int id: @path_type_repr
 );
@@ -2494,6 +2451,16 @@ slice_type_repr_type_reprs(
   int type_repr: @type_repr 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_field_lists(
   unique int id: @struct_field_list
 );
@@ -2505,6 +2472,16 @@ struct_field_list_fields(
   int field: @struct_field 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
+);
+
 try_exprs(
   unique int id: @try_expr
 );
@@ -2562,6 +2539,17 @@ tuple_pat_fields(
   int field: @pat ref
 );
 
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
 tuple_type_reprs(
   unique int id: @tuple_type_repr
 );
@@ -2709,6 +2697,31 @@ adt_derive_macro_expansions(
   int derive_macro_expansion: @macro_items ref
 );
 
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
 @assoc_item =
   @const
 | @function
@@ -3037,30 +3050,6 @@ path_expr_attrs(
   int attr: @attr ref
 );
 
-path_pats(
-  unique int id: @path_pat
-);
-
-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
 );
@@ -3159,17 +3148,6 @@ trait_alias_where_clauses(
   int where_clause: @where_clause ref
 );
 
-tuple_struct_pats(
-  unique int id: @tuple_struct_pat
-);
-
-#keyset[id, index]
-tuple_struct_pat_fields(
-  int id: @tuple_struct_pat ref,
-  int index: int ref,
-  int field: @pat ref
-);
-
 uses(
   unique int id: @use
 );
diff --git a/rust/ql/lib/rust.qll b/rust/ql/lib/rust.qll
index e7d02adea32b..b46e96868f63 100644
--- a/rust/ql/lib/rust.qll
+++ b/rust/ql/lib/rust.qll
@@ -1,5 +1,6 @@
 /** Top-level import for the Rust language pack */
 
+import Customizations
 import codeql.rust.elements
 import codeql.Locations
 import codeql.files.FileSystem
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme
new file mode 100644
index 000000000000..319c933d9615
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/old.dbscheme
@@ -0,0 +1,3637 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @closure_binder
+| @expr
+| @extern_item_list
+| @field_list
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+closure_binders(
+  unique int id: @closure_binder
+);
+
+#keyset[id]
+closure_binder_generic_param_lists(
+  int id: @closure_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_generic_param_lists(
+  int id: @where_pred ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_closure_binders(
+  int id: @closure_expr ref,
+  int closure_binder: @closure_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_generic_param_lists(
+  int id: @for_type_repr ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme
new file mode 100644
index 000000000000..b41e55c0dba1
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/rust.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties
new file mode 100644
index 000000000000..f843aa795590
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.properties
@@ -0,0 +1,18 @@
+description: Upgrade rust-analyzer to 0.0.300
+compatibility: backwards
+
+closure_binders.rel: delete
+closure_binder_generic_param_lists.rel: delete
+where_pred_generic_param_lists.rel: delete
+for_type_repr_generic_param_lists.rel: delete
+closure_expr_closure_binders.rel: delete
+closure_expr_for_binders.rel: reorder closure_expr_closure_binders.rel (@closure_expr id, @closure_binder binder) id binder
+
+for_binders.rel: run upgrade.ql new_for_binders
+for_binder_generic_param_lists.rel: run upgrade.ql new_for_binder_generic_param_lists
+for_type_repr_for_binders.rel: run upgrade.ql new_for_type_repr_for_binders
+where_pred_for_binders.rel: run upgrade.ql new_where_pred_for_binders
+type_bound_for_binders.rel: run upgrade.ql new_type_bound_for_binders
+for_type_reprs.rel: run upgrade.ql new_for_type_reprs
+type_bound_type_reprs.rel: run upgrade.ql new_type_bound_type_reprs
+locatable_locations.rel: run upgrade.ql new_locatable_locations
diff --git a/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql
new file mode 100644
index 000000000000..240991854e82
--- /dev/null
+++ b/rust/ql/lib/upgrades/319c933d9615ccf40f363548cafd51d08c74a534/upgrade.ql
@@ -0,0 +1,98 @@
+class Element extends @element {
+  string toString() { none() }
+}
+
+class ForTypeInTypeBound extends Element, @for_type_repr {
+  Element bound;
+
+  ForTypeInTypeBound() { type_bound_type_reprs(bound, this) }
+
+  Element getBound() { result = bound }
+
+  Element getGenericParamList() { for_type_repr_generic_param_lists(this, result) }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+// we must create new `ForBinder` elements to wrap `genericParamList`s of
+// `WherePred` and `ForType` elements
+//
+// previously, T: for<'a> X was TypeBound(type_repr=ForType(generic_param_list='a, type_repr=X))
+// but now it is TypeBound(for_binder=ForBinder(<generic_param_list='a), type_repr=X>)
+// so in that case we don't create new ForBinders, but rather we repurpose ForType ids as
+// the new ForBinders ones
+newtype TAddedElement =
+  TWherePredForBinder(Element wherePred, Element genericParamList) {
+    where_pred_generic_param_lists(wherePred, genericParamList)
+  } or
+  TForTypeForBinder(Element forType, Element genericParamList) {
+    for_type_repr_generic_param_lists(forType, genericParamList) and
+    not forType instanceof ForTypeInTypeBound
+  }
+
+module Fresh = QlBuiltins::NewEntity<TAddedElement>;
+
+class TNewElement = @element or Fresh::EntityId;
+
+class NewElement extends TNewElement {
+  string toString() { none() }
+
+  Element newGenericParamList() {
+    this = Fresh::map(TWherePredForBinder(_, result)) or
+    this = Fresh::map(TForTypeForBinder(_, result))
+  }
+}
+
+query predicate new_for_binders(NewElement id) {
+  closure_binders(id) or
+  id = Fresh::map(_) or
+  id instanceof ForTypeInTypeBound
+}
+
+query predicate new_for_binder_generic_param_lists(NewElement id, Element list) {
+  closure_binder_generic_param_lists(id, list) or
+  id.newGenericParamList() = list or
+  id.(ForTypeInTypeBound).getGenericParamList() = list
+}
+
+query predicate new_where_pred_for_binders(Element id, NewElement binder) {
+  binder = Fresh::map(TWherePredForBinder(id, _))
+}
+
+// we need to add a ForBinder to ForType if it's not in a TypeBound
+query predicate new_for_type_repr_for_binders(Element id, NewElement binder) {
+  binder = Fresh::map(TForTypeForBinder(id, _))
+}
+
+query predicate new_for_type_repr_type_reprs(Element id, Element type) {
+  for_type_repr_type_reprs(id, type) and not id instanceof ForTypeInTypeBound
+}
+
+// we attach a ForTypeInTypeBound id as a ForBinder one to its TypeBound
+query predicate new_type_bound_for_binders(Element id, NewElement binder) {
+  id = binder.(ForTypeInTypeBound).getBound()
+}
+
+// we restrict ForTypes to just the ones that are not in a TypeBound
+query predicate new_for_type_reprs(Element id) {
+  for_type_reprs(id) and not id instanceof ForTypeInTypeBound
+}
+
+// for a TypeBound around a ForType, we need to move type_repr from one directly to the other
+query predicate new_type_bound_type_reprs(Element bound, Element type) {
+  exists(Element originalType |
+    type_bound_type_reprs(bound, originalType) and
+    if for_type_reprs(originalType)
+    then for_type_repr_type_reprs(originalType, type)
+    else type = originalType
+  )
+}
+
+// for newly addded ForBinders, use same location as their generic param list
+query predicate new_locatable_locations(NewElement id, Location location) {
+  locatable_locations(id, location)
+  or
+  locatable_locations(id.newGenericParamList(), location)
+}
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
new file mode 100644
index 000000000000..b41e55c0dba1
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/old.dbscheme
@@ -0,0 +1,3644 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_segment
+| @rename
+| @resolvable
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+#keyset[id]
+addressable_extended_canonical_paths(
+  int id: @addressable ref,
+  string extended_canonical_path: string ref
+);
+
+#keyset[id]
+addressable_crate_origins(
+  int id: @addressable ref,
+  string crate_origin: string ref
+);
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+@resolvable =
+  @method_call_expr
+| @path_ast_node
+;
+
+#keyset[id]
+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]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  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
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+path_pats(
+  unique int id: @path_pat
+);
+
+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
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
new file mode 100644
index 000000000000..dfade44a27bd
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/rust.dbscheme
@@ -0,0 +1,3615 @@
+// generated by codegen, do not edit
+
+// from ../shared/tree-sitter-extractor/src/generator/prefix.dbscheme
+/*- 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
+);
+
+/*- Empty location -*/
+
+empty_location(
+  int location: @location_default ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- Diagnostic messages: severity -*/
+
+case @diagnostic.severity of
+  10 = @diagnostic_debug
+| 20 = @diagnostic_info
+| 30 = @diagnostic_warning
+| 40 = @diagnostic_error
+;
+
+/*- 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;
+
+/*- Database metadata -*/
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+overlayChangedFiles(
+  string path: string ref
+);
+
+
+// from prefix.dbscheme
+#keyset[id]
+locatable_locations(
+  int id: @locatable ref,
+  int location: @location_default ref
+);
+
+
+// from schema
+
+@element =
+  @extractor_step
+| @locatable
+| @named_crate
+| @unextracted
+;
+
+extractor_steps(
+  unique int id: @extractor_step,
+  string action: string ref,
+  int duration_ms: int ref
+);
+
+#keyset[id]
+extractor_step_files(
+  int id: @extractor_step ref,
+  int file: @file ref
+);
+
+@locatable =
+  @ast_node
+| @crate
+;
+
+named_crates(
+  unique int id: @named_crate,
+  string name: string ref,
+  int crate: @crate ref
+);
+
+@unextracted =
+  @missing
+| @unimplemented
+;
+
+@ast_node =
+  @abi
+| @addressable
+| @arg_list
+| @asm_dir_spec
+| @asm_operand
+| @asm_operand_expr
+| @asm_option
+| @asm_piece
+| @asm_reg_spec
+| @assoc_item_list
+| @attr
+| @callable
+| @expr
+| @extern_item_list
+| @field_list
+| @for_binder
+| @format_args_arg
+| @generic_arg
+| @generic_arg_list
+| @generic_param
+| @generic_param_list
+| @item_list
+| @label
+| @let_else
+| @macro_items
+| @match_arm
+| @match_arm_list
+| @match_guard
+| @meta
+| @name
+| @param_base
+| @param_list
+| @parenthesized_arg_list
+| @pat
+| @path
+| @path_ast_node
+| @path_segment
+| @rename
+| @ret_type_repr
+| @return_type_syntax
+| @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
+| @type_bound
+| @type_bound_list
+| @type_repr
+| @use_bound_generic_arg
+| @use_bound_generic_args
+| @use_tree
+| @use_tree_list
+| @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, 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
+);
+
+unimplementeds(
+  unique int id: @unimplemented
+);
+
+abis(
+  unique int id: @abi
+);
+
+#keyset[id]
+abi_abi_strings(
+  int id: @abi ref,
+  string abi_string: string ref
+);
+
+@addressable =
+  @item
+| @variant
+;
+
+arg_lists(
+  unique int id: @arg_list
+);
+
+#keyset[id, index]
+arg_list_args(
+  int id: @arg_list ref,
+  int index: int ref,
+  int arg: @expr ref
+);
+
+asm_dir_specs(
+  unique int id: @asm_dir_spec
+);
+
+@asm_operand =
+  @asm_const
+| @asm_label
+| @asm_reg_operand
+| @asm_sym
+;
+
+asm_operand_exprs(
+  unique int id: @asm_operand_expr
+);
+
+#keyset[id]
+asm_operand_expr_in_exprs(
+  int id: @asm_operand_expr ref,
+  int in_expr: @expr ref
+);
+
+#keyset[id]
+asm_operand_expr_out_exprs(
+  int id: @asm_operand_expr ref,
+  int out_expr: @expr ref
+);
+
+asm_options(
+  unique int id: @asm_option
+);
+
+#keyset[id]
+asm_option_is_raw(
+  int id: @asm_option ref
+);
+
+@asm_piece =
+  @asm_clobber_abi
+| @asm_operand_named
+| @asm_options_list
+;
+
+asm_reg_specs(
+  unique int id: @asm_reg_spec
+);
+
+#keyset[id]
+asm_reg_spec_identifiers(
+  int id: @asm_reg_spec ref,
+  int identifier: @name_ref ref
+);
+
+assoc_item_lists(
+  unique int id: @assoc_item_list
+);
+
+#keyset[id, index]
+assoc_item_list_assoc_items(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int assoc_item: @assoc_item ref
+);
+
+#keyset[id, index]
+assoc_item_list_attrs(
+  int id: @assoc_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+attrs(
+  unique int id: @attr
+);
+
+#keyset[id]
+attr_meta(
+  int id: @attr ref,
+  int meta: @meta ref
+);
+
+@callable =
+  @closure_expr
+| @function
+;
+
+#keyset[id]
+callable_param_lists(
+  int id: @callable ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id, index]
+callable_attrs(
+  int id: @callable ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+@expr =
+  @array_expr_internal
+| @asm_expr
+| @await_expr
+| @become_expr
+| @binary_expr
+| @break_expr
+| @call_expr_base
+| @cast_expr
+| @closure_expr
+| @continue_expr
+| @field_expr
+| @format_args_expr
+| @if_expr
+| @index_expr
+| @labelable_expr
+| @let_expr
+| @literal_expr
+| @macro_block_expr
+| @macro_expr
+| @match_expr
+| @offset_of_expr
+| @paren_expr
+| @path_expr_base
+| @prefix_expr
+| @range_expr
+| @ref_expr
+| @return_expr
+| @struct_expr
+| @try_expr
+| @tuple_expr
+| @underscore_expr
+| @yeet_expr
+| @yield_expr
+;
+
+extern_item_lists(
+  unique int id: @extern_item_list
+);
+
+#keyset[id, index]
+extern_item_list_attrs(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+extern_item_list_extern_items(
+  int id: @extern_item_list ref,
+  int index: int ref,
+  int extern_item: @extern_item ref
+);
+
+@field_list =
+  @struct_field_list
+| @tuple_field_list
+;
+
+for_binders(
+  unique int id: @for_binder
+);
+
+#keyset[id]
+for_binder_generic_param_lists(
+  int id: @for_binder ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+format_args_args(
+  unique int id: @format_args_arg
+);
+
+#keyset[id]
+format_args_arg_exprs(
+  int id: @format_args_arg ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+format_args_arg_names(
+  int id: @format_args_arg ref,
+  int name: @name ref
+);
+
+@generic_arg =
+  @assoc_type_arg
+| @const_arg
+| @lifetime_arg
+| @type_arg
+;
+
+generic_arg_lists(
+  unique int id: @generic_arg_list
+);
+
+#keyset[id, index]
+generic_arg_list_generic_args(
+  int id: @generic_arg_list ref,
+  int index: int ref,
+  int generic_arg: @generic_arg ref
+);
+
+@generic_param =
+  @const_param
+| @lifetime_param
+| @type_param
+;
+
+generic_param_lists(
+  unique int id: @generic_param_list
+);
+
+#keyset[id, index]
+generic_param_list_generic_params(
+  int id: @generic_param_list ref,
+  int index: int ref,
+  int generic_param: @generic_param ref
+);
+
+item_lists(
+  unique int id: @item_list
+);
+
+#keyset[id, index]
+item_list_attrs(
+  int id: @item_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+item_list_items(
+  int id: @item_list ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+labels(
+  unique int id: @label
+);
+
+#keyset[id]
+label_lifetimes(
+  int id: @label ref,
+  int lifetime: @lifetime ref
+);
+
+let_elses(
+  unique int id: @let_else
+);
+
+#keyset[id]
+let_else_block_exprs(
+  int id: @let_else ref,
+  int block_expr: @block_expr ref
+);
+
+macro_items(
+  unique int id: @macro_items
+);
+
+#keyset[id, index]
+macro_items_items(
+  int id: @macro_items ref,
+  int index: int ref,
+  int item: @item ref
+);
+
+match_arms(
+  unique int id: @match_arm
+);
+
+#keyset[id, index]
+match_arm_attrs(
+  int id: @match_arm ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_arm_exprs(
+  int id: @match_arm ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+match_arm_guards(
+  int id: @match_arm ref,
+  int guard: @match_guard ref
+);
+
+#keyset[id]
+match_arm_pats(
+  int id: @match_arm ref,
+  int pat: @pat ref
+);
+
+match_arm_lists(
+  unique int id: @match_arm_list
+);
+
+#keyset[id, index]
+match_arm_list_arms(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int arm: @match_arm ref
+);
+
+#keyset[id, index]
+match_arm_list_attrs(
+  int id: @match_arm_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+match_guards(
+  unique int id: @match_guard
+);
+
+#keyset[id]
+match_guard_conditions(
+  int id: @match_guard ref,
+  int condition: @expr ref
+);
+
+meta(
+  unique int id: @meta
+);
+
+#keyset[id]
+meta_exprs(
+  int id: @meta ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+meta_is_unsafe(
+  int id: @meta ref
+);
+
+#keyset[id]
+meta_paths(
+  int id: @meta ref,
+  int path: @path ref
+);
+
+#keyset[id]
+meta_token_trees(
+  int id: @meta ref,
+  int token_tree: @token_tree ref
+);
+
+names(
+  unique int id: @name
+);
+
+#keyset[id]
+name_texts(
+  int id: @name ref,
+  string text: string ref
+);
+
+@param_base =
+  @param
+| @self_param
+;
+
+#keyset[id, index]
+param_base_attrs(
+  int id: @param_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+param_base_type_reprs(
+  int id: @param_base ref,
+  int type_repr: @type_repr ref
+);
+
+param_lists(
+  unique int id: @param_list
+);
+
+#keyset[id, index]
+param_list_params(
+  int id: @param_list ref,
+  int index: int ref,
+  int param: @param ref
+);
+
+#keyset[id]
+param_list_self_params(
+  int id: @param_list ref,
+  int self_param: @self_param ref
+);
+
+parenthesized_arg_lists(
+  unique int id: @parenthesized_arg_list
+);
+
+#keyset[id, index]
+parenthesized_arg_list_type_args(
+  int id: @parenthesized_arg_list ref,
+  int index: int ref,
+  int type_arg: @type_arg ref
+);
+
+@pat =
+  @box_pat
+| @const_block_pat
+| @ident_pat
+| @literal_pat
+| @macro_pat
+| @or_pat
+| @paren_pat
+| @path_pat
+| @range_pat
+| @ref_pat
+| @rest_pat
+| @slice_pat
+| @struct_pat
+| @tuple_pat
+| @tuple_struct_pat
+| @wildcard_pat
+;
+
+paths(
+  unique int id: @path
+);
+
+#keyset[id]
+path_qualifiers(
+  int id: @path ref,
+  int qualifier: @path ref
+);
+
+#keyset[id]
+path_segments_(
+  int id: @path ref,
+  int segment: @path_segment ref
+);
+
+@path_ast_node =
+  @path_expr
+| @path_pat
+| @struct_expr
+| @struct_pat
+| @tuple_struct_pat
+;
+
+#keyset[id]
+path_ast_node_paths(
+  int id: @path_ast_node ref,
+  int path: @path ref
+);
+
+path_segments(
+  unique int id: @path_segment
+);
+
+#keyset[id]
+path_segment_generic_arg_lists(
+  int id: @path_segment ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+path_segment_identifiers(
+  int id: @path_segment ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+path_segment_parenthesized_arg_lists(
+  int id: @path_segment ref,
+  int parenthesized_arg_list: @parenthesized_arg_list ref
+);
+
+#keyset[id]
+path_segment_ret_types(
+  int id: @path_segment ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+path_segment_return_type_syntaxes(
+  int id: @path_segment ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+path_segment_type_reprs(
+  int id: @path_segment ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+path_segment_trait_type_reprs(
+  int id: @path_segment ref,
+  int trait_type_repr: @path_type_repr ref
+);
+
+renames(
+  unique int id: @rename
+);
+
+#keyset[id]
+rename_names(
+  int id: @rename ref,
+  int name: @name ref
+);
+
+ret_type_reprs(
+  unique int id: @ret_type_repr
+);
+
+#keyset[id]
+ret_type_repr_type_reprs(
+  int id: @ret_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+return_type_syntaxes(
+  unique int id: @return_type_syntax
+);
+
+source_files(
+  unique int id: @source_file
+);
+
+#keyset[id, index]
+source_file_attrs(
+  int id: @source_file 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
+);
+
+@stmt =
+  @expr_stmt
+| @item
+| @let_stmt
+;
+
+stmt_lists(
+  unique int id: @stmt_list
+);
+
+#keyset[id, index]
+stmt_list_attrs(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+stmt_list_statements(
+  int id: @stmt_list ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+stmt_list_tail_exprs(
+  int id: @stmt_list ref,
+  int tail_expr: @expr ref
+);
+
+struct_expr_fields(
+  unique int id: @struct_expr_field
+);
+
+#keyset[id, index]
+struct_expr_field_attrs(
+  int id: @struct_expr_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_expr_field_exprs(
+  int id: @struct_expr_field ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+struct_expr_field_identifiers(
+  int id: @struct_expr_field ref,
+  int identifier: @name_ref ref
+);
+
+struct_expr_field_lists(
+  unique int id: @struct_expr_field_list
+);
+
+#keyset[id, index]
+struct_expr_field_list_attrs(
+  int id: @struct_expr_field_list ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#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]
+struct_expr_field_list_spreads(
+  int id: @struct_expr_field_list ref,
+  int spread: @expr ref
+);
+
+struct_fields(
+  unique int id: @struct_field
+);
+
+#keyset[id, index]
+struct_field_attrs(
+  int id: @struct_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_defaults(
+  int id: @struct_field ref,
+  int default: @expr ref
+);
+
+#keyset[id]
+struct_field_is_unsafe(
+  int id: @struct_field ref
+);
+
+#keyset[id]
+struct_field_names(
+  int id: @struct_field ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_field_type_reprs(
+  int id: @struct_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+struct_field_visibilities(
+  int id: @struct_field ref,
+  int visibility: @visibility ref
+);
+
+struct_pat_fields(
+  unique int id: @struct_pat_field
+);
+
+#keyset[id, index]
+struct_pat_field_attrs(
+  int id: @struct_pat_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_pat_field_identifiers(
+  int id: @struct_pat_field ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+struct_pat_field_pats(
+  int id: @struct_pat_field ref,
+  int pat: @pat ref
+);
+
+struct_pat_field_lists(
+  unique int id: @struct_pat_field_list
+);
+
+#keyset[id, index]
+struct_pat_field_list_fields(
+  int id: @struct_pat_field_list ref,
+  int index: int ref,
+  int field: @struct_pat_field ref
+);
+
+#keyset[id]
+struct_pat_field_list_rest_pats(
+  int id: @struct_pat_field_list ref,
+  int rest_pat: @rest_pat ref
+);
+
+@token =
+  @comment
+;
+
+token_trees(
+  unique int id: @token_tree
+);
+
+tuple_fields(
+  unique int id: @tuple_field
+);
+
+#keyset[id, index]
+tuple_field_attrs(
+  int id: @tuple_field ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+tuple_field_type_reprs(
+  int id: @tuple_field ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+tuple_field_visibilities(
+  int id: @tuple_field ref,
+  int visibility: @visibility ref
+);
+
+type_bounds(
+  unique int id: @type_bound
+);
+
+#keyset[id]
+type_bound_for_binders(
+  int id: @type_bound ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+type_bound_is_async(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_is_const(
+  int id: @type_bound ref
+);
+
+#keyset[id]
+type_bound_lifetimes(
+  int id: @type_bound ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+type_bound_type_reprs(
+  int id: @type_bound ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_bound_use_bound_generic_args(
+  int id: @type_bound ref,
+  int use_bound_generic_args: @use_bound_generic_args ref
+);
+
+type_bound_lists(
+  unique int id: @type_bound_list
+);
+
+#keyset[id, index]
+type_bound_list_bounds(
+  int id: @type_bound_list ref,
+  int index: int ref,
+  int bound: @type_bound ref
+);
+
+@type_repr =
+  @array_type_repr
+| @dyn_trait_type_repr
+| @fn_ptr_type_repr
+| @for_type_repr
+| @impl_trait_type_repr
+| @infer_type_repr
+| @macro_type_repr
+| @never_type_repr
+| @paren_type_repr
+| @path_type_repr
+| @ptr_type_repr
+| @ref_type_repr
+| @slice_type_repr
+| @tuple_type_repr
+;
+
+@use_bound_generic_arg =
+  @lifetime
+| @name_ref
+;
+
+use_bound_generic_args(
+  unique int id: @use_bound_generic_args
+);
+
+#keyset[id, index]
+use_bound_generic_args_use_bound_generic_args(
+  int id: @use_bound_generic_args ref,
+  int index: int ref,
+  int use_bound_generic_arg: @use_bound_generic_arg ref
+);
+
+use_trees(
+  unique int id: @use_tree
+);
+
+#keyset[id]
+use_tree_is_glob(
+  int id: @use_tree ref
+);
+
+#keyset[id]
+use_tree_paths(
+  int id: @use_tree ref,
+  int path: @path ref
+);
+
+#keyset[id]
+use_tree_renames(
+  int id: @use_tree ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+use_tree_use_tree_lists(
+  int id: @use_tree ref,
+  int use_tree_list: @use_tree_list ref
+);
+
+use_tree_lists(
+  unique int id: @use_tree_list
+);
+
+#keyset[id, index]
+use_tree_list_use_trees(
+  int id: @use_tree_list ref,
+  int index: int ref,
+  int use_tree: @use_tree ref
+);
+
+variant_lists(
+  unique int id: @variant_list
+);
+
+#keyset[id, index]
+variant_list_variants(
+  int id: @variant_list ref,
+  int index: int ref,
+  int variant: @variant ref
+);
+
+visibilities(
+  unique int id: @visibility
+);
+
+#keyset[id]
+visibility_paths(
+  int id: @visibility ref,
+  int path: @path ref
+);
+
+where_clauses(
+  unique int id: @where_clause
+);
+
+#keyset[id, index]
+where_clause_predicates(
+  int id: @where_clause ref,
+  int index: int ref,
+  int predicate: @where_pred ref
+);
+
+where_preds(
+  unique int id: @where_pred
+);
+
+#keyset[id]
+where_pred_for_binders(
+  int id: @where_pred ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+where_pred_lifetimes(
+  int id: @where_pred ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+where_pred_type_reprs(
+  int id: @where_pred ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+where_pred_type_bound_lists(
+  int id: @where_pred ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+array_expr_internals(
+  unique int id: @array_expr_internal
+);
+
+#keyset[id, index]
+array_expr_internal_attrs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+array_expr_internal_exprs(
+  int id: @array_expr_internal ref,
+  int index: int ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+array_expr_internal_is_semicolon(
+  int id: @array_expr_internal ref
+);
+
+array_type_reprs(
+  unique int id: @array_type_repr
+);
+
+#keyset[id]
+array_type_repr_const_args(
+  int id: @array_type_repr ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+array_type_repr_element_type_reprs(
+  int id: @array_type_repr ref,
+  int element_type_repr: @type_repr ref
+);
+
+asm_clobber_abis(
+  unique int id: @asm_clobber_abi
+);
+
+asm_consts(
+  unique int id: @asm_const
+);
+
+#keyset[id]
+asm_const_exprs(
+  int id: @asm_const ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+asm_const_is_const(
+  int id: @asm_const ref
+);
+
+asm_labels(
+  unique int id: @asm_label
+);
+
+#keyset[id]
+asm_label_block_exprs(
+  int id: @asm_label ref,
+  int block_expr: @block_expr ref
+);
+
+asm_operand_nameds(
+  unique int id: @asm_operand_named
+);
+
+#keyset[id]
+asm_operand_named_asm_operands(
+  int id: @asm_operand_named ref,
+  int asm_operand: @asm_operand ref
+);
+
+#keyset[id]
+asm_operand_named_names(
+  int id: @asm_operand_named ref,
+  int name: @name ref
+);
+
+asm_options_lists(
+  unique int id: @asm_options_list
+);
+
+#keyset[id, index]
+asm_options_list_asm_options(
+  int id: @asm_options_list ref,
+  int index: int ref,
+  int asm_option: @asm_option ref
+);
+
+asm_reg_operands(
+  unique int id: @asm_reg_operand
+);
+
+#keyset[id]
+asm_reg_operand_asm_dir_specs(
+  int id: @asm_reg_operand ref,
+  int asm_dir_spec: @asm_dir_spec ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_operand_exprs(
+  int id: @asm_reg_operand ref,
+  int asm_operand_expr: @asm_operand_expr ref
+);
+
+#keyset[id]
+asm_reg_operand_asm_reg_specs(
+  int id: @asm_reg_operand ref,
+  int asm_reg_spec: @asm_reg_spec ref
+);
+
+asm_syms(
+  unique int id: @asm_sym
+);
+
+#keyset[id]
+asm_sym_paths(
+  int id: @asm_sym ref,
+  int path: @path ref
+);
+
+assoc_type_args(
+  unique int id: @assoc_type_arg
+);
+
+#keyset[id]
+assoc_type_arg_const_args(
+  int id: @assoc_type_arg ref,
+  int const_arg: @const_arg ref
+);
+
+#keyset[id]
+assoc_type_arg_generic_arg_lists(
+  int id: @assoc_type_arg ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+assoc_type_arg_identifiers(
+  int id: @assoc_type_arg ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+assoc_type_arg_param_lists(
+  int id: @assoc_type_arg ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+assoc_type_arg_ret_types(
+  int id: @assoc_type_arg ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_return_type_syntaxes(
+  int id: @assoc_type_arg ref,
+  int return_type_syntax: @return_type_syntax ref
+);
+
+#keyset[id]
+assoc_type_arg_type_reprs(
+  int id: @assoc_type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+assoc_type_arg_type_bound_lists(
+  int id: @assoc_type_arg ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+await_exprs(
+  unique int id: @await_expr
+);
+
+#keyset[id, index]
+await_expr_attrs(
+  int id: @await_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+await_expr_exprs(
+  int id: @await_expr ref,
+  int expr: @expr ref
+);
+
+become_exprs(
+  unique int id: @become_expr
+);
+
+#keyset[id, index]
+become_expr_attrs(
+  int id: @become_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+become_expr_exprs(
+  int id: @become_expr ref,
+  int expr: @expr ref
+);
+
+binary_exprs(
+  unique int id: @binary_expr
+);
+
+#keyset[id, index]
+binary_expr_attrs(
+  int id: @binary_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+binary_expr_lhs(
+  int id: @binary_expr ref,
+  int lhs: @expr ref
+);
+
+#keyset[id]
+binary_expr_operator_names(
+  int id: @binary_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+binary_expr_rhs(
+  int id: @binary_expr ref,
+  int rhs: @expr ref
+);
+
+box_pats(
+  unique int id: @box_pat
+);
+
+#keyset[id]
+box_pat_pats(
+  int id: @box_pat ref,
+  int pat: @pat ref
+);
+
+break_exprs(
+  unique int id: @break_expr
+);
+
+#keyset[id, index]
+break_expr_attrs(
+  int id: @break_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+break_expr_exprs(
+  int id: @break_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+break_expr_lifetimes(
+  int id: @break_expr ref,
+  int lifetime: @lifetime ref
+);
+
+@call_expr_base =
+  @call_expr
+| @method_call_expr
+;
+
+#keyset[id]
+call_expr_base_arg_lists(
+  int id: @call_expr_base ref,
+  int arg_list: @arg_list ref
+);
+
+#keyset[id, index]
+call_expr_base_attrs(
+  int id: @call_expr_base ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+cast_exprs(
+  unique int id: @cast_expr
+);
+
+#keyset[id, index]
+cast_expr_attrs(
+  int id: @cast_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+cast_expr_exprs(
+  int id: @cast_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+cast_expr_type_reprs(
+  int id: @cast_expr ref,
+  int type_repr: @type_repr ref
+);
+
+closure_exprs(
+  unique int id: @closure_expr
+);
+
+#keyset[id]
+closure_expr_bodies(
+  int id: @closure_expr ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+closure_expr_for_binders(
+  int id: @closure_expr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+closure_expr_is_async(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_const(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_gen(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_move(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_is_static(
+  int id: @closure_expr ref
+);
+
+#keyset[id]
+closure_expr_ret_types(
+  int id: @closure_expr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+comments(
+  unique int id: @comment,
+  int parent: @ast_node ref,
+  string text: string ref
+);
+
+const_args(
+  unique int id: @const_arg
+);
+
+#keyset[id]
+const_arg_exprs(
+  int id: @const_arg ref,
+  int expr: @expr ref
+);
+
+const_block_pats(
+  unique int id: @const_block_pat
+);
+
+#keyset[id]
+const_block_pat_block_exprs(
+  int id: @const_block_pat ref,
+  int block_expr: @block_expr ref
+);
+
+#keyset[id]
+const_block_pat_is_const(
+  int id: @const_block_pat ref
+);
+
+const_params(
+  unique int id: @const_param
+);
+
+#keyset[id, index]
+const_param_attrs(
+  int id: @const_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_param_default_vals(
+  int id: @const_param ref,
+  int default_val: @const_arg ref
+);
+
+#keyset[id]
+const_param_is_const(
+  int id: @const_param ref
+);
+
+#keyset[id]
+const_param_names(
+  int id: @const_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_param_type_reprs(
+  int id: @const_param ref,
+  int type_repr: @type_repr ref
+);
+
+continue_exprs(
+  unique int id: @continue_expr
+);
+
+#keyset[id, index]
+continue_expr_attrs(
+  int id: @continue_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+continue_expr_lifetimes(
+  int id: @continue_expr ref,
+  int lifetime: @lifetime ref
+);
+
+dyn_trait_type_reprs(
+  unique int id: @dyn_trait_type_repr
+);
+
+#keyset[id]
+dyn_trait_type_repr_type_bound_lists(
+  int id: @dyn_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+expr_stmts(
+  unique int id: @expr_stmt
+);
+
+#keyset[id]
+expr_stmt_exprs(
+  int id: @expr_stmt ref,
+  int expr: @expr ref
+);
+
+field_exprs(
+  unique int id: @field_expr
+);
+
+#keyset[id, index]
+field_expr_attrs(
+  int id: @field_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+field_expr_containers(
+  int id: @field_expr ref,
+  int container: @expr ref
+);
+
+#keyset[id]
+field_expr_identifiers(
+  int id: @field_expr ref,
+  int identifier: @name_ref ref
+);
+
+fn_ptr_type_reprs(
+  unique int id: @fn_ptr_type_repr
+);
+
+#keyset[id]
+fn_ptr_type_repr_abis(
+  int id: @fn_ptr_type_repr ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_async(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_const(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_is_unsafe(
+  int id: @fn_ptr_type_repr ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_param_lists(
+  int id: @fn_ptr_type_repr ref,
+  int param_list: @param_list ref
+);
+
+#keyset[id]
+fn_ptr_type_repr_ret_types(
+  int id: @fn_ptr_type_repr ref,
+  int ret_type: @ret_type_repr ref
+);
+
+for_type_reprs(
+  unique int id: @for_type_repr
+);
+
+#keyset[id]
+for_type_repr_for_binders(
+  int id: @for_type_repr ref,
+  int for_binder: @for_binder ref
+);
+
+#keyset[id]
+for_type_repr_type_reprs(
+  int id: @for_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+format_args_exprs(
+  unique int id: @format_args_expr
+);
+
+#keyset[id, index]
+format_args_expr_args(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int arg: @format_args_arg ref
+);
+
+#keyset[id, index]
+format_args_expr_attrs(
+  int id: @format_args_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+format_args_expr_templates(
+  int id: @format_args_expr ref,
+  int template: @expr ref
+);
+
+ident_pats(
+  unique int id: @ident_pat
+);
+
+#keyset[id, index]
+ident_pat_attrs(
+  int id: @ident_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ident_pat_is_mut(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_is_ref(
+  int id: @ident_pat ref
+);
+
+#keyset[id]
+ident_pat_names(
+  int id: @ident_pat ref,
+  int name: @name ref
+);
+
+#keyset[id]
+ident_pat_pats(
+  int id: @ident_pat ref,
+  int pat: @pat ref
+);
+
+if_exprs(
+  unique int id: @if_expr
+);
+
+#keyset[id, index]
+if_expr_attrs(
+  int id: @if_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+if_expr_conditions(
+  int id: @if_expr ref,
+  int condition: @expr ref
+);
+
+#keyset[id]
+if_expr_elses(
+  int id: @if_expr ref,
+  int else: @expr ref
+);
+
+#keyset[id]
+if_expr_thens(
+  int id: @if_expr ref,
+  int then: @block_expr ref
+);
+
+impl_trait_type_reprs(
+  unique int id: @impl_trait_type_repr
+);
+
+#keyset[id]
+impl_trait_type_repr_type_bound_lists(
+  int id: @impl_trait_type_repr ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+index_exprs(
+  unique int id: @index_expr
+);
+
+#keyset[id, index]
+index_expr_attrs(
+  int id: @index_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+index_expr_bases(
+  int id: @index_expr ref,
+  int base: @expr ref
+);
+
+#keyset[id]
+index_expr_indices(
+  int id: @index_expr ref,
+  int index: @expr ref
+);
+
+infer_type_reprs(
+  unique int id: @infer_type_repr
+);
+
+@item =
+  @adt
+| @asm_expr
+| @assoc_item
+| @extern_block
+| @extern_crate
+| @extern_item
+| @impl
+| @macro_def
+| @macro_rules
+| @module
+| @trait
+| @trait_alias
+| @use
+;
+
+#keyset[id]
+item_attribute_macro_expansions(
+  int id: @item ref,
+  int attribute_macro_expansion: @macro_items ref
+);
+
+@labelable_expr =
+  @block_expr
+| @looping_expr
+;
+
+#keyset[id]
+labelable_expr_labels(
+  int id: @labelable_expr ref,
+  int label: @label ref
+);
+
+let_exprs(
+  unique int id: @let_expr
+);
+
+#keyset[id, index]
+let_expr_attrs(
+  int id: @let_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_expr_scrutinees(
+  int id: @let_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+let_expr_pats(
+  int id: @let_expr ref,
+  int pat: @pat ref
+);
+
+let_stmts(
+  unique int id: @let_stmt
+);
+
+#keyset[id, index]
+let_stmt_attrs(
+  int id: @let_stmt ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+let_stmt_initializers(
+  int id: @let_stmt ref,
+  int initializer: @expr ref
+);
+
+#keyset[id]
+let_stmt_let_elses(
+  int id: @let_stmt ref,
+  int let_else: @let_else ref
+);
+
+#keyset[id]
+let_stmt_pats(
+  int id: @let_stmt ref,
+  int pat: @pat ref
+);
+
+#keyset[id]
+let_stmt_type_reprs(
+  int id: @let_stmt ref,
+  int type_repr: @type_repr ref
+);
+
+lifetimes(
+  unique int id: @lifetime
+);
+
+#keyset[id]
+lifetime_texts(
+  int id: @lifetime ref,
+  string text: string ref
+);
+
+lifetime_args(
+  unique int id: @lifetime_arg
+);
+
+#keyset[id]
+lifetime_arg_lifetimes(
+  int id: @lifetime_arg ref,
+  int lifetime: @lifetime ref
+);
+
+lifetime_params(
+  unique int id: @lifetime_param
+);
+
+#keyset[id, index]
+lifetime_param_attrs(
+  int id: @lifetime_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+lifetime_param_lifetimes(
+  int id: @lifetime_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+lifetime_param_type_bound_lists(
+  int id: @lifetime_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+literal_exprs(
+  unique int id: @literal_expr
+);
+
+#keyset[id, index]
+literal_expr_attrs(
+  int id: @literal_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+literal_expr_text_values(
+  int id: @literal_expr ref,
+  string text_value: string ref
+);
+
+literal_pats(
+  unique int id: @literal_pat
+);
+
+#keyset[id]
+literal_pat_literals(
+  int id: @literal_pat ref,
+  int literal: @literal_expr ref
+);
+
+macro_block_exprs(
+  unique int id: @macro_block_expr
+);
+
+#keyset[id, index]
+macro_block_expr_statements(
+  int id: @macro_block_expr ref,
+  int index: int ref,
+  int statement: @stmt ref
+);
+
+#keyset[id]
+macro_block_expr_tail_exprs(
+  int id: @macro_block_expr ref,
+  int tail_expr: @expr ref
+);
+
+macro_exprs(
+  unique int id: @macro_expr
+);
+
+#keyset[id]
+macro_expr_macro_calls(
+  int id: @macro_expr ref,
+  int macro_call: @macro_call ref
+);
+
+macro_pats(
+  unique int id: @macro_pat
+);
+
+#keyset[id]
+macro_pat_macro_calls(
+  int id: @macro_pat ref,
+  int macro_call: @macro_call ref
+);
+
+macro_type_reprs(
+  unique int id: @macro_type_repr
+);
+
+#keyset[id]
+macro_type_repr_macro_calls(
+  int id: @macro_type_repr ref,
+  int macro_call: @macro_call ref
+);
+
+match_exprs(
+  unique int id: @match_expr
+);
+
+#keyset[id, index]
+match_expr_attrs(
+  int id: @match_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+match_expr_scrutinees(
+  int id: @match_expr ref,
+  int scrutinee: @expr ref
+);
+
+#keyset[id]
+match_expr_match_arm_lists(
+  int id: @match_expr ref,
+  int match_arm_list: @match_arm_list ref
+);
+
+name_refs(
+  unique int id: @name_ref
+);
+
+#keyset[id]
+name_ref_texts(
+  int id: @name_ref ref,
+  string text: string ref
+);
+
+never_type_reprs(
+  unique int id: @never_type_repr
+);
+
+offset_of_exprs(
+  unique int id: @offset_of_expr
+);
+
+#keyset[id, index]
+offset_of_expr_attrs(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+offset_of_expr_fields(
+  int id: @offset_of_expr ref,
+  int index: int ref,
+  int field: @name_ref ref
+);
+
+#keyset[id]
+offset_of_expr_type_reprs(
+  int id: @offset_of_expr ref,
+  int type_repr: @type_repr ref
+);
+
+or_pats(
+  unique int id: @or_pat
+);
+
+#keyset[id, index]
+or_pat_pats(
+  int id: @or_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+params(
+  unique int id: @param
+);
+
+#keyset[id]
+param_pats(
+  int id: @param ref,
+  int pat: @pat ref
+);
+
+paren_exprs(
+  unique int id: @paren_expr
+);
+
+#keyset[id, index]
+paren_expr_attrs(
+  int id: @paren_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+paren_expr_exprs(
+  int id: @paren_expr ref,
+  int expr: @expr ref
+);
+
+paren_pats(
+  unique int id: @paren_pat
+);
+
+#keyset[id]
+paren_pat_pats(
+  int id: @paren_pat ref,
+  int pat: @pat ref
+);
+
+paren_type_reprs(
+  unique int id: @paren_type_repr
+);
+
+#keyset[id]
+paren_type_repr_type_reprs(
+  int id: @paren_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+@path_expr_base =
+  @path_expr
+;
+
+path_pats(
+  unique int id: @path_pat
+);
+
+path_type_reprs(
+  unique int id: @path_type_repr
+);
+
+#keyset[id]
+path_type_repr_paths(
+  int id: @path_type_repr ref,
+  int path: @path ref
+);
+
+prefix_exprs(
+  unique int id: @prefix_expr
+);
+
+#keyset[id, index]
+prefix_expr_attrs(
+  int id: @prefix_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+prefix_expr_exprs(
+  int id: @prefix_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+prefix_expr_operator_names(
+  int id: @prefix_expr ref,
+  string operator_name: string ref
+);
+
+ptr_type_reprs(
+  unique int id: @ptr_type_repr
+);
+
+#keyset[id]
+ptr_type_repr_is_const(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_is_mut(
+  int id: @ptr_type_repr ref
+);
+
+#keyset[id]
+ptr_type_repr_type_reprs(
+  int id: @ptr_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+range_exprs(
+  unique int id: @range_expr
+);
+
+#keyset[id, index]
+range_expr_attrs(
+  int id: @range_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+range_expr_ends(
+  int id: @range_expr ref,
+  int end: @expr ref
+);
+
+#keyset[id]
+range_expr_operator_names(
+  int id: @range_expr ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_expr_starts(
+  int id: @range_expr ref,
+  int start: @expr ref
+);
+
+range_pats(
+  unique int id: @range_pat
+);
+
+#keyset[id]
+range_pat_ends(
+  int id: @range_pat ref,
+  int end: @pat ref
+);
+
+#keyset[id]
+range_pat_operator_names(
+  int id: @range_pat ref,
+  string operator_name: string ref
+);
+
+#keyset[id]
+range_pat_starts(
+  int id: @range_pat ref,
+  int start: @pat ref
+);
+
+ref_exprs(
+  unique int id: @ref_expr
+);
+
+#keyset[id, index]
+ref_expr_attrs(
+  int id: @ref_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+ref_expr_exprs(
+  int id: @ref_expr ref,
+  int expr: @expr ref
+);
+
+#keyset[id]
+ref_expr_is_const(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_mut(
+  int id: @ref_expr ref
+);
+
+#keyset[id]
+ref_expr_is_raw(
+  int id: @ref_expr ref
+);
+
+ref_pats(
+  unique int id: @ref_pat
+);
+
+#keyset[id]
+ref_pat_is_mut(
+  int id: @ref_pat ref
+);
+
+#keyset[id]
+ref_pat_pats(
+  int id: @ref_pat ref,
+  int pat: @pat ref
+);
+
+ref_type_reprs(
+  unique int id: @ref_type_repr
+);
+
+#keyset[id]
+ref_type_repr_is_mut(
+  int id: @ref_type_repr ref
+);
+
+#keyset[id]
+ref_type_repr_lifetimes(
+  int id: @ref_type_repr ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+ref_type_repr_type_reprs(
+  int id: @ref_type_repr ref,
+  int type_repr: @type_repr ref
+);
+
+rest_pats(
+  unique int id: @rest_pat
+);
+
+#keyset[id, index]
+rest_pat_attrs(
+  int id: @rest_pat ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+return_exprs(
+  unique int id: @return_expr
+);
+
+#keyset[id, index]
+return_expr_attrs(
+  int id: @return_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+return_expr_exprs(
+  int id: @return_expr ref,
+  int expr: @expr ref
+);
+
+self_params(
+  unique int id: @self_param
+);
+
+#keyset[id]
+self_param_is_ref(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_is_mut(
+  int id: @self_param ref
+);
+
+#keyset[id]
+self_param_lifetimes(
+  int id: @self_param ref,
+  int lifetime: @lifetime ref
+);
+
+#keyset[id]
+self_param_names(
+  int id: @self_param ref,
+  int name: @name ref
+);
+
+slice_pats(
+  unique int id: @slice_pat
+);
+
+#keyset[id, index]
+slice_pat_pats(
+  int id: @slice_pat ref,
+  int index: int ref,
+  int pat: @pat ref
+);
+
+slice_type_reprs(
+  unique int id: @slice_type_repr
+);
+
+#keyset[id]
+slice_type_repr_type_reprs(
+  int id: @slice_type_repr ref,
+  int type_repr: @type_repr 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_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
+);
+
+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
+);
+
+try_exprs(
+  unique int id: @try_expr
+);
+
+#keyset[id, index]
+try_expr_attrs(
+  int id: @try_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+try_expr_exprs(
+  int id: @try_expr ref,
+  int expr: @expr ref
+);
+
+tuple_exprs(
+  unique int id: @tuple_expr
+);
+
+#keyset[id, index]
+tuple_expr_attrs(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+tuple_expr_fields(
+  int id: @tuple_expr ref,
+  int index: int ref,
+  int field: @expr ref
+);
+
+tuple_field_lists(
+  unique int id: @tuple_field_list
+);
+
+#keyset[id, index]
+tuple_field_list_fields(
+  int id: @tuple_field_list ref,
+  int index: int ref,
+  int field: @tuple_field ref
+);
+
+tuple_pats(
+  unique int id: @tuple_pat
+);
+
+#keyset[id, index]
+tuple_pat_fields(
+  int id: @tuple_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_struct_pats(
+  unique int id: @tuple_struct_pat
+);
+
+#keyset[id, index]
+tuple_struct_pat_fields(
+  int id: @tuple_struct_pat ref,
+  int index: int ref,
+  int field: @pat ref
+);
+
+tuple_type_reprs(
+  unique int id: @tuple_type_repr
+);
+
+#keyset[id, index]
+tuple_type_repr_fields(
+  int id: @tuple_type_repr ref,
+  int index: int ref,
+  int field: @type_repr ref
+);
+
+type_args(
+  unique int id: @type_arg
+);
+
+#keyset[id]
+type_arg_type_reprs(
+  int id: @type_arg ref,
+  int type_repr: @type_repr ref
+);
+
+type_params(
+  unique int id: @type_param
+);
+
+#keyset[id, index]
+type_param_attrs(
+  int id: @type_param ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_param_default_types(
+  int id: @type_param ref,
+  int default_type: @type_repr ref
+);
+
+#keyset[id]
+type_param_names(
+  int id: @type_param ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_param_type_bound_lists(
+  int id: @type_param ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+underscore_exprs(
+  unique int id: @underscore_expr
+);
+
+#keyset[id, index]
+underscore_expr_attrs(
+  int id: @underscore_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+variants(
+  unique int id: @variant
+);
+
+#keyset[id, index]
+variant_attrs(
+  int id: @variant ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+variant_discriminants(
+  int id: @variant ref,
+  int discriminant: @expr ref
+);
+
+#keyset[id]
+variant_field_lists(
+  int id: @variant ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+variant_names(
+  int id: @variant ref,
+  int name: @name ref
+);
+
+#keyset[id]
+variant_visibilities(
+  int id: @variant ref,
+  int visibility: @visibility ref
+);
+
+wildcard_pats(
+  unique int id: @wildcard_pat
+);
+
+yeet_exprs(
+  unique int id: @yeet_expr
+);
+
+#keyset[id, index]
+yeet_expr_attrs(
+  int id: @yeet_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yeet_expr_exprs(
+  int id: @yeet_expr ref,
+  int expr: @expr ref
+);
+
+yield_exprs(
+  unique int id: @yield_expr
+);
+
+#keyset[id, index]
+yield_expr_attrs(
+  int id: @yield_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+yield_expr_exprs(
+  int id: @yield_expr ref,
+  int expr: @expr ref
+);
+
+@adt =
+  @enum
+| @struct
+| @union
+;
+
+#keyset[id, index]
+adt_derive_macro_expansions(
+  int id: @adt ref,
+  int index: int ref,
+  int derive_macro_expansion: @macro_items ref
+);
+
+asm_exprs(
+  unique int id: @asm_expr
+);
+
+#keyset[id, index]
+asm_expr_asm_pieces(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int asm_piece: @asm_piece ref
+);
+
+#keyset[id, index]
+asm_expr_attrs(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id, index]
+asm_expr_templates(
+  int id: @asm_expr ref,
+  int index: int ref,
+  int template: @expr ref
+);
+
+@assoc_item =
+  @const
+| @function
+| @macro_call
+| @type_alias
+;
+
+block_exprs(
+  unique int id: @block_expr
+);
+
+#keyset[id, index]
+block_expr_attrs(
+  int id: @block_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+block_expr_is_async(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_const(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_gen(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_move(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_try(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_is_unsafe(
+  int id: @block_expr ref
+);
+
+#keyset[id]
+block_expr_stmt_lists(
+  int id: @block_expr ref,
+  int stmt_list: @stmt_list ref
+);
+
+call_exprs(
+  unique int id: @call_expr
+);
+
+#keyset[id]
+call_expr_functions(
+  int id: @call_expr ref,
+  int function: @expr ref
+);
+
+extern_blocks(
+  unique int id: @extern_block
+);
+
+#keyset[id]
+extern_block_abis(
+  int id: @extern_block ref,
+  int abi: @abi ref
+);
+
+#keyset[id, index]
+extern_block_attrs(
+  int id: @extern_block ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_block_extern_item_lists(
+  int id: @extern_block ref,
+  int extern_item_list: @extern_item_list ref
+);
+
+#keyset[id]
+extern_block_is_unsafe(
+  int id: @extern_block ref
+);
+
+extern_crates(
+  unique int id: @extern_crate
+);
+
+#keyset[id, index]
+extern_crate_attrs(
+  int id: @extern_crate ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+extern_crate_identifiers(
+  int id: @extern_crate ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+extern_crate_renames(
+  int id: @extern_crate ref,
+  int rename: @rename ref
+);
+
+#keyset[id]
+extern_crate_visibilities(
+  int id: @extern_crate ref,
+  int visibility: @visibility ref
+);
+
+@extern_item =
+  @function
+| @macro_call
+| @static
+| @type_alias
+;
+
+impls(
+  unique int id: @impl
+);
+
+#keyset[id]
+impl_assoc_item_lists(
+  int id: @impl ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+impl_attrs(
+  int id: @impl ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+impl_generic_param_lists(
+  int id: @impl ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+impl_is_const(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_default(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_is_unsafe(
+  int id: @impl ref
+);
+
+#keyset[id]
+impl_self_ties(
+  int id: @impl ref,
+  int self_ty: @type_repr ref
+);
+
+#keyset[id]
+impl_traits(
+  int id: @impl ref,
+  int trait: @type_repr ref
+);
+
+#keyset[id]
+impl_visibilities(
+  int id: @impl ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+impl_where_clauses(
+  int id: @impl ref,
+  int where_clause: @where_clause ref
+);
+
+@looping_expr =
+  @for_expr
+| @loop_expr
+| @while_expr
+;
+
+#keyset[id]
+looping_expr_loop_bodies(
+  int id: @looping_expr ref,
+  int loop_body: @block_expr ref
+);
+
+macro_defs(
+  unique int id: @macro_def
+);
+
+#keyset[id]
+macro_def_args(
+  int id: @macro_def ref,
+  int args: @token_tree ref
+);
+
+#keyset[id, index]
+macro_def_attrs(
+  int id: @macro_def ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_def_bodies(
+  int id: @macro_def ref,
+  int body: @token_tree ref
+);
+
+#keyset[id]
+macro_def_names(
+  int id: @macro_def ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_def_visibilities(
+  int id: @macro_def ref,
+  int visibility: @visibility ref
+);
+
+macro_rules(
+  unique int id: @macro_rules
+);
+
+#keyset[id, index]
+macro_rules_attrs(
+  int id: @macro_rules ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_rules_names(
+  int id: @macro_rules ref,
+  int name: @name ref
+);
+
+#keyset[id]
+macro_rules_token_trees(
+  int id: @macro_rules ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_rules_visibilities(
+  int id: @macro_rules ref,
+  int visibility: @visibility ref
+);
+
+method_call_exprs(
+  unique int id: @method_call_expr
+);
+
+#keyset[id]
+method_call_expr_generic_arg_lists(
+  int id: @method_call_expr ref,
+  int generic_arg_list: @generic_arg_list ref
+);
+
+#keyset[id]
+method_call_expr_identifiers(
+  int id: @method_call_expr ref,
+  int identifier: @name_ref ref
+);
+
+#keyset[id]
+method_call_expr_receivers(
+  int id: @method_call_expr ref,
+  int receiver: @expr ref
+);
+
+modules(
+  unique int id: @module
+);
+
+#keyset[id, index]
+module_attrs(
+  int id: @module ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+module_item_lists(
+  int id: @module ref,
+  int item_list: @item_list ref
+);
+
+#keyset[id]
+module_names(
+  int id: @module ref,
+  int name: @name ref
+);
+
+#keyset[id]
+module_visibilities(
+  int id: @module ref,
+  int visibility: @visibility ref
+);
+
+path_exprs(
+  unique int id: @path_expr
+);
+
+#keyset[id, index]
+path_expr_attrs(
+  int id: @path_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+traits(
+  unique int id: @trait
+);
+
+#keyset[id]
+trait_assoc_item_lists(
+  int id: @trait ref,
+  int assoc_item_list: @assoc_item_list ref
+);
+
+#keyset[id, index]
+trait_attrs(
+  int id: @trait ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_generic_param_lists(
+  int id: @trait ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_is_auto(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_is_unsafe(
+  int id: @trait ref
+);
+
+#keyset[id]
+trait_names(
+  int id: @trait ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_type_bound_lists(
+  int id: @trait ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_visibilities(
+  int id: @trait ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_where_clauses(
+  int id: @trait ref,
+  int where_clause: @where_clause ref
+);
+
+trait_aliases(
+  unique int id: @trait_alias
+);
+
+#keyset[id, index]
+trait_alias_attrs(
+  int id: @trait_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+trait_alias_generic_param_lists(
+  int id: @trait_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+trait_alias_names(
+  int id: @trait_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+trait_alias_type_bound_lists(
+  int id: @trait_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+trait_alias_visibilities(
+  int id: @trait_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+trait_alias_where_clauses(
+  int id: @trait_alias ref,
+  int where_clause: @where_clause ref
+);
+
+uses(
+  unique int id: @use
+);
+
+#keyset[id, index]
+use_attrs(
+  int id: @use ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+use_use_trees(
+  int id: @use ref,
+  int use_tree: @use_tree ref
+);
+
+#keyset[id]
+use_visibilities(
+  int id: @use ref,
+  int visibility: @visibility ref
+);
+
+consts(
+  unique int id: @const
+);
+
+#keyset[id, index]
+const_attrs(
+  int id: @const ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+const_bodies(
+  int id: @const ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+const_generic_param_lists(
+  int id: @const ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+const_is_const(
+  int id: @const ref
+);
+
+#keyset[id]
+const_is_default(
+  int id: @const ref
+);
+
+#keyset[id]
+const_names(
+  int id: @const ref,
+  int name: @name ref
+);
+
+#keyset[id]
+const_type_reprs(
+  int id: @const ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+const_visibilities(
+  int id: @const ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+const_where_clauses(
+  int id: @const ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+const_has_implementation(
+  int id: @const ref
+);
+
+enums(
+  unique int id: @enum
+);
+
+#keyset[id, index]
+enum_attrs(
+  int id: @enum ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+enum_generic_param_lists(
+  int id: @enum ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+enum_names(
+  int id: @enum ref,
+  int name: @name ref
+);
+
+#keyset[id]
+enum_variant_lists(
+  int id: @enum ref,
+  int variant_list: @variant_list ref
+);
+
+#keyset[id]
+enum_visibilities(
+  int id: @enum ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+enum_where_clauses(
+  int id: @enum ref,
+  int where_clause: @where_clause ref
+);
+
+for_exprs(
+  unique int id: @for_expr
+);
+
+#keyset[id, index]
+for_expr_attrs(
+  int id: @for_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+for_expr_iterables(
+  int id: @for_expr ref,
+  int iterable: @expr ref
+);
+
+#keyset[id]
+for_expr_pats(
+  int id: @for_expr ref,
+  int pat: @pat ref
+);
+
+functions(
+  unique int id: @function
+);
+
+#keyset[id]
+function_abis(
+  int id: @function ref,
+  int abi: @abi ref
+);
+
+#keyset[id]
+function_bodies(
+  int id: @function ref,
+  int body: @block_expr ref
+);
+
+#keyset[id]
+function_generic_param_lists(
+  int id: @function ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+function_is_async(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_const(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_default(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_gen(
+  int id: @function ref
+);
+
+#keyset[id]
+function_is_unsafe(
+  int id: @function ref
+);
+
+#keyset[id]
+function_names(
+  int id: @function ref,
+  int name: @name ref
+);
+
+#keyset[id]
+function_ret_types(
+  int id: @function ref,
+  int ret_type: @ret_type_repr ref
+);
+
+#keyset[id]
+function_visibilities(
+  int id: @function ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+function_where_clauses(
+  int id: @function ref,
+  int where_clause: @where_clause ref
+);
+
+#keyset[id]
+function_has_implementation(
+  int id: @function ref
+);
+
+loop_exprs(
+  unique int id: @loop_expr
+);
+
+#keyset[id, index]
+loop_expr_attrs(
+  int id: @loop_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+macro_calls(
+  unique int id: @macro_call
+);
+
+#keyset[id, index]
+macro_call_attrs(
+  int id: @macro_call ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+macro_call_paths(
+  int id: @macro_call ref,
+  int path: @path ref
+);
+
+#keyset[id]
+macro_call_token_trees(
+  int id: @macro_call ref,
+  int token_tree: @token_tree ref
+);
+
+#keyset[id]
+macro_call_macro_call_expansions(
+  int id: @macro_call ref,
+  int macro_call_expansion: @ast_node ref
+);
+
+statics(
+  unique int id: @static
+);
+
+#keyset[id, index]
+static_attrs(
+  int id: @static ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+static_bodies(
+  int id: @static ref,
+  int body: @expr ref
+);
+
+#keyset[id]
+static_is_mut(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_static(
+  int id: @static ref
+);
+
+#keyset[id]
+static_is_unsafe(
+  int id: @static ref
+);
+
+#keyset[id]
+static_names(
+  int id: @static ref,
+  int name: @name ref
+);
+
+#keyset[id]
+static_type_reprs(
+  int id: @static ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+static_visibilities(
+  int id: @static ref,
+  int visibility: @visibility ref
+);
+
+structs(
+  unique int id: @struct
+);
+
+#keyset[id, index]
+struct_attrs(
+  int id: @struct ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+struct_field_lists_(
+  int id: @struct ref,
+  int field_list: @field_list ref
+);
+
+#keyset[id]
+struct_generic_param_lists(
+  int id: @struct ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+struct_names(
+  int id: @struct ref,
+  int name: @name ref
+);
+
+#keyset[id]
+struct_visibilities(
+  int id: @struct ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+struct_where_clauses(
+  int id: @struct ref,
+  int where_clause: @where_clause ref
+);
+
+type_aliases(
+  unique int id: @type_alias
+);
+
+#keyset[id, index]
+type_alias_attrs(
+  int id: @type_alias ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+type_alias_generic_param_lists(
+  int id: @type_alias ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+type_alias_is_default(
+  int id: @type_alias ref
+);
+
+#keyset[id]
+type_alias_names(
+  int id: @type_alias ref,
+  int name: @name ref
+);
+
+#keyset[id]
+type_alias_type_reprs(
+  int id: @type_alias ref,
+  int type_repr: @type_repr ref
+);
+
+#keyset[id]
+type_alias_type_bound_lists(
+  int id: @type_alias ref,
+  int type_bound_list: @type_bound_list ref
+);
+
+#keyset[id]
+type_alias_visibilities(
+  int id: @type_alias ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+type_alias_where_clauses(
+  int id: @type_alias ref,
+  int where_clause: @where_clause ref
+);
+
+unions(
+  unique int id: @union
+);
+
+#keyset[id, index]
+union_attrs(
+  int id: @union ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+union_generic_param_lists(
+  int id: @union ref,
+  int generic_param_list: @generic_param_list ref
+);
+
+#keyset[id]
+union_names(
+  int id: @union ref,
+  int name: @name ref
+);
+
+#keyset[id]
+union_struct_field_lists(
+  int id: @union ref,
+  int struct_field_list: @struct_field_list ref
+);
+
+#keyset[id]
+union_visibilities(
+  int id: @union ref,
+  int visibility: @visibility ref
+);
+
+#keyset[id]
+union_where_clauses(
+  int id: @union ref,
+  int where_clause: @where_clause ref
+);
+
+while_exprs(
+  unique int id: @while_expr
+);
+
+#keyset[id, index]
+while_expr_attrs(
+  int id: @while_expr ref,
+  int index: int ref,
+  int attr: @attr ref
+);
+
+#keyset[id]
+while_expr_conditions(
+  int id: @while_expr ref,
+  int condition: @expr ref
+);
diff --git a/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
new file mode 100644
index 000000000000..b50f4c8228c7
--- /dev/null
+++ b/rust/ql/lib/upgrades/b41e55c0dba14a139d01dbee713aca5efe5b818a/upgrade.properties
@@ -0,0 +1,6 @@
+description: Remove extractor generated paths
+compatibility: full
+addressable_extended_canonical_paths.rel: delete
+addressable_crate_origins.rel: delete
+resolvable_resolved_paths.rel: delete
+resolvable_resolved_crate_origins.rel: delete
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index 94231f13170d..b8ca5b715684 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,14 @@
+## 0.1.15
+
+### New Queries
+
+* Added a new query, `rust/log-injection`, for detecting cases where log entries could be forged by a malicious user.
+
+### Bug Fixes
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`) has been tuned so that it won't trigger on databases that have extracted normally. This will remove spurious messages of "Low Rust analysis quality" on the CodeQL status page.
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
 ## 0.1.14
 
 ### New Queries
diff --git a/rust/ql/src/change-notes/released/0.1.15.md b/rust/ql/src/change-notes/released/0.1.15.md
new file mode 100644
index 000000000000..eb88879de2c5
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.15.md
@@ -0,0 +1,10 @@
+## 0.1.15
+
+### New Queries
+
+* Added a new query, `rust/log-injection`, for detecting cases where log entries could be forged by a malicious user.
+
+### Bug Fixes
+
+* The "Low Rust analysis quality" query (`rust/diagnostic/database-quality`) has been tuned so that it won't trigger on databases that have extracted normally. This will remove spurious messages of "Low Rust analysis quality" on the CodeQL status page.
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index 76f7b27fb4e4..747196347438 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.14
+lastReleaseVersion: 0.1.15
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index 1e39349d4fc7..0c1ad4faa1c5 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.14
+version: 0.1.15
 groups:
   - rust
   - queries
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp b/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp
new file mode 100644
index 000000000000..f957d385c582
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjection.qhelp
@@ -0,0 +1,47 @@
+<!DOCTYPE qhelp PUBLIC
+  "-//Semmle//qhelp//EN"
+  "qhelp.dtd">
+<qhelp>
+
+<overview>
+
+<p>If unsanitized user input is written to a log entry, a malicious user may be able to forge new log entries.</p>
+
+<p>Forgery can occur if a user provides some input with characters that are interpreted
+when the log output is displayed. If the log is displayed as a plain text file, then new
+line characters can be used by a malicious user. If the log is displayed as HTML, then
+arbitrary HTML may be included to spoof log entries.</p>
+</overview>
+
+<recommendation>
+<p>
+User input should be suitably sanitized before it is logged.
+</p>
+<p>
+If the log entries are in plain text, then line breaks should be removed from user input using
+<code>String::replace</code> or similar. Care should also be taken that user input is clearly marked
+in log entries.
+</p>
+<p>
+For log entries that will be displayed in HTML, user input should be HTML-encoded before being logged, to prevent forgery and
+other forms of HTML injection.
+</p>
+
+</recommendation>
+
+<example>
+<p>In the first example, a username, provided by the user via command line arguments, is logged using the <code>log</code> crate.
+If a malicious user provides <code>Guest\n[INFO] User: Admin\n</code> as a username parameter, 
+the log entry will be split into multiple lines, where the second line will appear as <code>[INFO] User: Admin</code>, 
+potentially forging a legitimate admin login entry.
+</p>
+<sample src="LogInjectionBad.rs" />
+
+<p>In the second example, <code>String::replace</code> is used to ensure no line endings are present in the user input before logging.</p>
+<sample src="LogInjectionGood.rs" />
+</example>
+
+<references>
+<li>OWASP: <a href="https://owasp.org/www-community/attacks/Log_Injection">Log Injection</a>.</li>
+</references>
+</qhelp>
\ No newline at end of file
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjection.ql b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
new file mode 100644
index 000000000000..64d9c47c7909
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjection.ql
@@ -0,0 +1,41 @@
+/**
+ * @name Log injection
+ * @description Building log entries from user-controlled sources is vulnerable to
+ *              insertion of forged log entries by a malicious user.
+ * @kind path-problem
+ * @problem.severity error
+ * @security-severity 2.6
+ * @precision medium
+ * @id rust/log-injection
+ * @tags security
+ *       external/cwe/cwe-117
+ */
+
+import rust
+import codeql.rust.dataflow.DataFlow
+import codeql.rust.dataflow.TaintTracking
+import codeql.rust.security.LogInjectionExtensions
+
+/**
+ * A taint configuration for tainted data that reaches a log injection sink.
+ */
+module LogInjectionConfig implements DataFlow::ConfigSig {
+  import LogInjection
+
+  predicate isSource(DataFlow::Node node) { node instanceof Source }
+
+  predicate isSink(DataFlow::Node node) { node instanceof Sink }
+
+  predicate isBarrier(DataFlow::Node barrier) { barrier instanceof Barrier }
+
+  predicate observeDiffInformedIncrementalMode() { any() }
+}
+
+module LogInjectionFlow = TaintTracking::Global<LogInjectionConfig>;
+
+import LogInjectionFlow::PathGraph
+
+from LogInjectionFlow::PathNode sourceNode, LogInjectionFlow::PathNode sinkNode
+where LogInjectionFlow::flowPath(sourceNode, sinkNode)
+select sinkNode.getNode(), sourceNode, sinkNode, "Log entry depends on a $@.", sourceNode.getNode(),
+  "user-provided value"
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs b/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs
new file mode 100644
index 000000000000..b881c6813366
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjectionBad.rs
@@ -0,0 +1,13 @@
+use std::env;
+use log::info;
+
+fn main() {
+    env_logger::init();
+
+    // Get username from command line arguments
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone();
+
+    // BAD: log message constructed with unsanitized user input
+    info!("User login attempt: {}", username);
+}
diff --git a/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs b/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs
new file mode 100644
index 000000000000..db6a24102e9b
--- /dev/null
+++ b/rust/ql/src/queries/security/CWE-117/LogInjectionGood.rs
@@ -0,0 +1,19 @@
+use std::env;
+use log::info;
+
+fn sanitize_for_logging(input: &str) -> String {
+    // Remove newlines and carriage returns to prevent log injection
+    input.replace('\n', "").replace('\r', "")
+}
+
+fn main() {
+    env_logger::init();
+
+    // Get username from command line arguments
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone();
+
+    // GOOD: log message constructed with sanitized user input
+    let sanitized_username = sanitize_for_logging(username.as_str());
+    info!("User login attempt: {}", sanitized_username);
+}
diff --git a/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql b/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
index cd0dca79119b..f5a43c5419c6 100644
--- a/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
+++ b/rust/ql/src/queries/security/CWE-798/HardcodedCryptographicValue.ql
@@ -39,12 +39,6 @@ module HardcodedCryptographicValueConfig implements DataFlow::ConfigSig {
     //  case like `[0, 0, 0, 0]`)
     isSource(node)
   }
-
-  predicate allowImplicitRead(DataFlow::Node node, DataFlow::ContentSet c) {
-    // flow out from reference content at sinks.
-    isSink(node) and
-    c.getAReadContent() instanceof ReferenceContent
-  }
 }
 
 module HardcodedCryptographicValueFlow = TaintTracking::Global<HardcodedCryptographicValueConfig>;
diff --git a/rust/ql/src/queries/summary/Stats.qll b/rust/ql/src/queries/summary/Stats.qll
index 030cd74ebe25..bada752ab2ed 100644
--- a/rust/ql/src/queries/summary/Stats.qll
+++ b/rust/ql/src/queries/summary/Stats.qll
@@ -22,6 +22,7 @@ private import codeql.rust.security.AccessInvalidPointerExtensions
 private import codeql.rust.security.CleartextLoggingExtensions
 private import codeql.rust.security.CleartextStorageDatabaseExtensions
 private import codeql.rust.security.CleartextTransmissionExtensions
+private import codeql.rust.security.LogInjectionExtensions
 private import codeql.rust.security.SqlInjectionExtensions
 private import codeql.rust.security.TaintedPathExtensions
 private import codeql.rust.security.UncontrolledAllocationSizeExtensions
diff --git a/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql b/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
index c5e3645e993e..18e7445939f9 100644
--- a/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
+++ b/rust/ql/src/queries/telemetry/DatabaseQualityDiagnostics.ql
@@ -12,11 +12,9 @@ import codeql.util.Unit
 class DbQualityDiagnostic extends Unit {
   DbQualityDiagnostic() {
     exists(float percentageGood |
-      CallTargetStatsReport::percentageOfOk(_, percentageGood)
+      CallTargetStatsReport::percentageOfOk(_, percentageGood) and percentageGood < 50
       or
-      MacroCallTargetStatsReport::percentageOfOk(_, percentageGood)
-    |
-      percentageGood < 95
+      MacroCallTargetStatsReport::percentageOfOk(_, percentageGood) and percentageGood < 50
     )
   }
 
diff --git a/rust/ql/src/queries/telemetry/ExtractorInformation.ql b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
index d47dc04ace73..f61dfe515a9e 100644
--- a/rust/ql/src/queries/telemetry/ExtractorInformation.ql
+++ b/rust/ql/src/queries/telemetry/ExtractorInformation.ql
@@ -8,7 +8,6 @@
 
 import rust
 import DatabaseQuality
-import RustAnalyzerComparison
 import codeql.rust.Diagnostics
 
 predicate fileCount(string key, int value) {
@@ -42,20 +41,6 @@ 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
   (
@@ -69,9 +54,7 @@ where
     CallTargetStatsReport::percentageOfOk(key, value) or
     MacroCallTargetStatsReport::numberOfOk(key, value) or
     MacroCallTargetStatsReport::numberOfNotOk(key, value) or
-    MacroCallTargetStatsReport::percentageOfOk(key, value) or
-    pathResolutionCompare(key, value) or
-    callGraphCompare(key, value)
+    MacroCallTargetStatsReport::percentageOfOk(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
deleted file mode 100644
index 21460e8ba9bc..000000000000
--- a/rust/ql/src/queries/telemetry/RustAnalyzerComparison.qll
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * INTERNAL: Do not use.
- *
- * Provides functionality for comparing data from `rust-analyzer` with data computed
- * in QL.
- */
-
-import rust
-
-pragma[nomagic]
-private predicate resolvesAsItem(Resolvable r, Item i) {
-  none()
-  // r.getResolvedPath() = i.getExtendedCanonicalPath() and
-  // (
-  //   r.getResolvedCrateOrigin() = i.getCrateOrigin()
-  //   or
-  //   not r.hasResolvedCrateOrigin() and not i.hasCrateOrigin()
-  // )
-}
-
-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) {
-    none()
-    //s.hasResolvedPath()
-  }
-
-  Item resolve(PathResolution::Source s) { resolvesAsItem(s, 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) { resolvesAsItem(CallExprBaseImpl::getCallResolvable(c), 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>;
-
-predicate qlMissingCanonicalPath(Addressable a, string path) {
-  none()
-  // path = a.getExtendedCanonicalPath() and
-  // not exists(a.getCanonicalPath(_))
-}
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/Cargo.lock b/rust/ql/test/extractor-tests/canonical_path_disabled/Cargo.lock
deleted file mode 100644
index b9856cfaf77d..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/Cargo.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "test"
-version = "0.0.1"
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs b/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
deleted file mode 100644
index a5a6abd136cf..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/anonymous.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// 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
deleted file mode 100644
index fa5b23518d4d..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.expected
+++ /dev/null
@@ -1,26 +0,0 @@
-| anonymous.rs:6:1:35:1 | fn canonicals | test::anonymous::canonicals |
-| anonymous.rs:37:1:39:1 | fn other | test::anonymous::other |
-| {EXTERNAL LOCATION} | fn trim | <core::str>::trim |
-| lib.rs:1:1:1:18 | mod anonymous | test::anonymous |
-| lib.rs:2:1:2:16 | mod regular | test::regular |
-| regular.rs:4:1:5:18 | struct Struct | test::regular::Struct |
-| regular.rs:5:12:5:17 | fn eq | <test::regular::Struct as core::cmp::PartialEq>::eq |
-| regular.rs:5:12:5:17 | impl ...::Eq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::Eq> |
-| regular.rs:5:12:5:17 | impl ...::PartialEq for Struct::<...> { ... } | <test::regular::Struct as core::cmp::PartialEq> |
-| regular.rs:7:1:9:1 | trait Trait | test::regular::Trait |
-| regular.rs:8:5:8:16 | fn f | <_ as test::regular::Trait>::f |
-| regular.rs:11:1:13:1 | impl Trait for Struct { ... } | <test::regular::Struct as test::regular::Trait> |
-| regular.rs:12:5:12:18 | fn f | <test::regular::Struct as test::regular::Trait>::f |
-| regular.rs:15:1:17:1 | impl Struct { ... } | <test::regular::Struct> |
-| regular.rs:16:5:16:18 | fn g | <test::regular::Struct>::g |
-| regular.rs:19:1:21:1 | trait TraitWithBlanketImpl | test::regular::TraitWithBlanketImpl |
-| regular.rs:20:5:20:16 | fn h | <_ as test::regular::TraitWithBlanketImpl>::h |
-| regular.rs:27:1:27:12 | fn free | test::regular::free |
-| regular.rs:29:1:35:1 | fn usage | test::regular::usage |
-| regular.rs:37:1:41:1 | enum MyEnum | test::regular::MyEnum |
-| regular.rs:38:5:38:12 | Variant1 | test::regular::MyEnum::Variant1 |
-| regular.rs:39:5:39:19 | Variant2 | test::regular::MyEnum::Variant2 |
-| regular.rs:40:5:40:25 | Variant3 | test::regular::MyEnum::Variant3 |
-| regular.rs:43:1:49:1 | fn enum_qualified_usage | test::regular::enum_qualified_usage |
-| regular.rs:51:1:58:1 | fn enum_unqualified_usage | test::regular::enum_unqualified_usage |
-| regular.rs:60:1:66:1 | fn enum_match | test::regular::enum_match |
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
deleted file mode 100644
index 9a5712b5135b..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/canonical_paths.qlref
+++ /dev/null
@@ -1,2 +0,0 @@
-query: extractor-tests/canonical_path/canonical_paths.ql
-postprocess: utils/test/ExternalLocationPostProcessing.ql
\ No newline at end of file
diff --git a/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml b/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
deleted file mode 100644
index baee4ba5afe9..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/options.yml
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index b958e0c02dad..000000000000
--- a/rust/ql/test/extractor-tests/canonical_path_disabled/regular.rs
+++ /dev/null
@@ -1,66 +0,0 @@
-// 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/generated/.generated_tests.list b/rust/ql/test/extractor-tests/generated/.generated_tests.list
index a4fab823b031..c0e2d095be66 100644
--- a/rust/ql/test/extractor-tests/generated/.generated_tests.list
+++ b/rust/ql/test/extractor-tests/generated/.generated_tests.list
@@ -25,8 +25,7 @@ BoxPat/gen_box_pat.rs 1493e24b732370b577ade38c47db17fa157df19f5390606a67a6040e49
 BreakExpr/gen_break_expr.rs aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031 aacdf9df7fc51d19742b9e813835c0bd0913017e8d62765960e06b27d58b9031
 CallExpr/gen_call_expr.rs 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401 013a7c878996aefb25b94b68eebc4f0b1bb74ccd09e91c491980817a383e2401
 CastExpr/gen_cast_expr.rs c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5 c3892211fbae4fed7cb1f25ff1679fd79d2878bf0bf2bd4b7982af23d00129f5
-ClosureBinder/gen_closure_binder.rs 14b5e2deb2bbba164f1aee378be18e99e3c5a926628e964dcc2fbb349ff3b672 14b5e2deb2bbba164f1aee378be18e99e3c5a926628e964dcc2fbb349ff3b672
-ClosureExpr/gen_closure_expr.rs 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80 15bd9abdb8aaffabb8bb335f8ebd0571eb5f29115e1dc8d11837aa988702cd80
+ClosureExpr/gen_closure_expr.rs bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4 bd95408103b7f2084e526e6d35cf3319b2e9d7219aff4c80e4e6691180c549b4
 Comment/gen_comment.rs 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6 1e1f9f43161a79c096c2056e8b7f5346385ab7addcdec68c2d53b383dd3debe6
 Const/gen_const.rs a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f a3b971134a4204d0da12563fcefa9ab72f3f2f2e957e82b70c8548b5807f375f
 ConstArg/gen_const_arg.rs 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e 6a15d099c61ffa814e8e0e0fca2d8ff481d73ad81959064e0a214d3172a9d49e
@@ -41,8 +40,9 @@ ExternCrate/gen_extern_crate.rs 8d6bfd8d993a8e3a95ae9ccb576bd55be0c6a1d0893cfe15
 ExternItemList/gen_extern_item_list.rs f9a03ddf20387871b96994915c9a725feb333d061544c0fb6d2e6b1a1961d6ed f9a03ddf20387871b96994915c9a725feb333d061544c0fb6d2e6b1a1961d6ed
 FieldExpr/gen_field_expr.rs 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b 9a70500d592e0a071b03d974a55558b3bc0df531ff11bce5898feb36e17ffd8b
 FnPtrTypeRepr/gen_fn_ptr_type_repr.rs c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e c154ec0cc43236d133f6b946374f3063b89e5cbf9e96d9ee66877be4f948888e
+ForBinder/gen_for_binder.rs e3c9e5ffd3f2a5a546af9ab6e2a2ed733baf9cf609e05850b70feb31478a0bae e3c9e5ffd3f2a5a546af9ab6e2a2ed733baf9cf609e05850b70feb31478a0bae
 ForExpr/gen_for_expr.rs 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122 003dc36e3dc4db6e3a4accd410c316f14334ba5b3d5d675c851a91dcd5185122
-ForTypeRepr/gen_for_type_repr.rs 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2 86f2f11f399d8072add3d3109a186d82d95d141660b18986bce738b7e9ec81a2
+ForTypeRepr/gen_for_type_repr.rs fdbcbce6065082f350f8d3f77c23424bec8883336e4cd69ce8f41b185a51dc50 fdbcbce6065082f350f8d3f77c23424bec8883336e4cd69ce8f41b185a51dc50
 FormatArgsExpr/gen_format.rs e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33 e9d8e7b98d0050ad6053c2459cb21faab00078e74245336a5962438336f76d33
 FormatArgsExpr/gen_format_args_arg.rs 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f 53ffd6abe4cd899c57d1973b31df0edc1d5eaa5835b19172ec4cda15bb3db28f
 FormatArgsExpr/gen_format_args_expr.rs 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2 72c806ed163e9dcce2d0c5c8664d409b2aa635c1022c91959f9e8ae084f05bf2
@@ -67,7 +67,7 @@ LifetimeParam/gen_lifetime_param.rs e3f9a417ae7a88a4d81d9cb747b361a3246d270d142f
 LiteralExpr/gen_literal_expr.rs 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d 2db01ad390e5c0c63a957c043230a462cb4cc25715eea6ede15d43c55d35976d
 LiteralPat/gen_literal_pat.rs a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3 a471b481b6989001817a3988696f445d9a4dea784e543c346536dacbee1e96f3
 LoopExpr/gen_loop_expr.rs 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619 35deaf35e765db4ae3124a11284266d8f341d1ce7b700030efada0dda8878619
-MacroBlockExpr/gen_macro_block_expr.rs 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b 2e45dcf44bf2e8404b49ce9abeee4931572693174b5d96f3fd81eb40ea8e7b4b
+MacroBlockExpr/gen_macro_block_expr.rs 4284a6e6ad81827d8616a00fec7f5bc21104eed40d93e3acc2b933ee22cb8577 4284a6e6ad81827d8616a00fec7f5bc21104eed40d93e3acc2b933ee22cb8577
 MacroCall/gen_macro_call.rs c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6 c30added613d9edb3cb1321ae46fc6a088a2f22d2cc979119466ec02f6e09ed6
 MacroDef/gen_macro_def.rs 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378 6f895ecab8c13a73c28ce67fcee39baf7928745a80fb440811014f6d31b22378
 MacroExpr/gen_macro_expr.rs 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0 5e1748356f431eea343a2aad2798c22073151940ea2cda0f0cce78c3d96104f0
@@ -116,7 +116,7 @@ SourceFile/gen_source_file.rs c0469cc8f0ecce3dd2e77963216d7e8808046014533359a44c
 Static/gen_static.rs 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a 21314018ea184c1ddcb594d67bab97ae18ceaf663d9f120f39ff755d389dde7a
 StmtList/gen_stmt_list.rs adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db adbd82045a50e2051434ce3cdd524c9f2c6ad9f3dd02b4766fb107e2e99212db
 Struct/gen_struct.rs 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b 5e181e90075f716c04c75e4ef0334abe3d5f419cd9ccfadfe595c09fab33566b
-StructExpr/gen_struct_expr.rs 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb 8dd9a578625a88623c725b8afdfd8b636e1c3c991fe96c55b24d4b283d2212fb
+StructExpr/gen_struct_expr.rs e7824008b0b73d02f6243fd8a18e0ef93c63bfe775a878fc2679c3870fc342fd e7824008b0b73d02f6243fd8a18e0ef93c63bfe775a878fc2679c3870fc342fd
 StructExprField/gen_struct_expr_field.rs 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084 4ccca8e8ad462b4873f5604f0afdd1836027b8d39e36fbe7d6624ef3e744a084
 StructExprFieldList/gen_struct_expr_field_list.rs bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc bc17e356690cfb1cd51f7dbe5ac88c0b9188c9bf94b9e3cc82581120190f33dc
 StructField/gen_struct_field.rs 0884e458732ab74b4c7debee4fbef014f847815be5a6ddeba467844d33607c6e 0884e458732ab74b4c7debee4fbef014f847815be5a6ddeba467844d33607c6e
@@ -128,7 +128,7 @@ TokenTree/gen_token_tree.rs 3fdc9a36a1870bb2bedf66c8fe37d368f4ac18488e7118b86e39
 Trait/gen_trait.rs bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea bac694993e224f9c6dd86cfb28c54846ae1b3bae45a1e58d3149c884184487ea
 TraitAlias/gen_trait_alias.rs 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9 425d78a7cb87db7737ceaf713c9a62e0411537374d1bc58c5b1fb80cc25732c9
 TryExpr/gen_try_expr.rs f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e f60198181a423661f4ed1bf6f98d475f40ada190b7b5fc6af97aa5e45ca29a1e
-TupleExpr/gen_tuple_expr.rs 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374 8ecd1b6ecc58a0319eed434a423cc6f41bdf1901b1950e6e79735d7f7b2f8374
+TupleExpr/gen_tuple_expr.rs 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01 27e56846b3f08c37c8a345169c2a532b2023d231d46a5bdf586bbc6d8fb36a01
 TupleField/gen_tuple_field.rs 5d6b4f356af895541f975cc1fd90116fd047fe914c2049d47f61e4a43a8c2af4 5d6b4f356af895541f975cc1fd90116fd047fe914c2049d47f61e4a43a8c2af4
 TupleFieldList/gen_tuple_field_list.rs 42f0af8c391fb9e33fe09b791e0e719cadf5143b58764f8a5d38f8d9054daca7 42f0af8c391fb9e33fe09b791e0e719cadf5143b58764f8a5d38f8d9054daca7
 TuplePat/gen_tuple_pat.rs b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148 b1b0c9c5ff1b787f380644691c77807655a4f6441fc7431c90ecf78c54c26148
@@ -136,7 +136,7 @@ TupleStructPat/gen_tuple_struct_pat.rs 601ca8813272d15b4c8fd7402d0d28a42a62be828
 TupleTypeRepr/gen_tuple_type_repr.rs 64873a6a1cd5df6cd10165d7e9fa0399902b6bfbac086ef3a7ce83237b816879 64873a6a1cd5df6cd10165d7e9fa0399902b6bfbac086ef3a7ce83237b816879
 TypeAlias/gen_type_alias.rs da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143 da2b959f1a2a4f5471c231025404ca82a1bc79ac68adcda5a67292c428ad6143
 TypeArg/gen_type_arg.rs a0e455d7173b51330db63f1b7ac9c5d4263d33b3a115f97a8167d4dcc42469ff a0e455d7173b51330db63f1b7ac9c5d4263d33b3a115f97a8167d4dcc42469ff
-TypeBound/gen_type_bound.rs 7487ae3fd7c3a481efe96ce7894fc974b96276ecd78e0ccb141c698b5c6f5eaa 7487ae3fd7c3a481efe96ce7894fc974b96276ecd78e0ccb141c698b5c6f5eaa
+TypeBound/gen_type_bound.rs f7ed1dcfde0b9cae65580a990be6dc122be3e02f5771dd0f8f75b306bda1b29a f7ed1dcfde0b9cae65580a990be6dc122be3e02f5771dd0f8f75b306bda1b29a
 TypeBoundList/gen_type_bound_list.rs f61e80667385f6e8f51452a401d355b8939dbb1e1a7d3a506023639cb387bfbd f61e80667385f6e8f51452a401d355b8939dbb1e1a7d3a506023639cb387bfbd
 TypeParam/gen_type_param.rs 00b92ac7042ae83be1e37cd22f6d02098ca3157dc1ef45fbdf3b5f252ea6a8de 00b92ac7042ae83be1e37cd22f6d02098ca3157dc1ef45fbdf3b5f252ea6a8de
 UnderscoreExpr/gen_underscore_expr.rs fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52 fe34e99d322bf86c0f5509c9b5fd6e1e8abbdf63dbe7e01687344a41e9aabe52
@@ -149,7 +149,7 @@ Variant/gen_variant.rs fa3d3a9e3e0c3aa565b965fad9c3dc2ffd5a8d82963e3a55a9acbb0f1
 VariantList/gen_variant_list.rs a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d a1faa4d59b072f139d14cb8a6d63a0ce8c473170d6320a07ce6bb9d517f8486d
 Visibility/gen_visibility.rs cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52 cfa4b05fa7ba7c4ffa8f9c880b13792735e4f7e92a648f43110e914075e97a52
 WhereClause/gen_where_clause.rs 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a 22522c933be47f8f7f9d0caddfa41925c08df343c564baad2fe2daa14f1bfb1a
-WherePred/gen_where_pred.rs dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619 dbc7bf0f246a04b42783f910c6f09841393f0e0a78f0a584891a99d0cf461619
+WherePred/gen_where_pred.rs 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb 7036e34f1a1f77c5cf031f385be4583472ea4f99e8b4b4ec3c72a65c23e418bb
 WhileExpr/gen_while_expr.rs 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879 97276c5946a36001638491c99a36170d22bc6011c5e59f621b37c7a2d7737879
 WildcardPat/gen_wildcard_pat.rs f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc f1b175eeb3a0fc32bbcfb70a207be33dfde51a7d5198f72b8e08948f0d43e3dc
 YeetExpr/gen_yeet_expr.rs c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d c243b785a2cbd941bcec23dafc23ffbc64b93cf2843b6ede9783cdb81fed439d
diff --git a/rust/ql/test/extractor-tests/generated/.gitattributes b/rust/ql/test/extractor-tests/generated/.gitattributes
index dd1c891195ed..2679395b34f1 100644
--- a/rust/ql/test/extractor-tests/generated/.gitattributes
+++ b/rust/ql/test/extractor-tests/generated/.gitattributes
@@ -27,7 +27,6 @@
 /BreakExpr/gen_break_expr.rs linguist-generated
 /CallExpr/gen_call_expr.rs linguist-generated
 /CastExpr/gen_cast_expr.rs linguist-generated
-/ClosureBinder/gen_closure_binder.rs linguist-generated
 /ClosureExpr/gen_closure_expr.rs linguist-generated
 /Comment/gen_comment.rs linguist-generated
 /Const/gen_const.rs linguist-generated
@@ -43,6 +42,7 @@
 /ExternItemList/gen_extern_item_list.rs linguist-generated
 /FieldExpr/gen_field_expr.rs linguist-generated
 /FnPtrTypeRepr/gen_fn_ptr_type_repr.rs linguist-generated
+/ForBinder/gen_for_binder.rs linguist-generated
 /ForExpr/gen_for_expr.rs linguist-generated
 /ForTypeRepr/gen_for_type_repr.rs linguist-generated
 /FormatArgsExpr/gen_format.rs linguist-generated
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
index 2091c3814d5d..8deb774356ca 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.expected
@@ -1,5 +1,6 @@
 instances
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr |
+getAttributeMacroExpansion
 getAsmPiece
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 0 | gen_asm_expr.rs:7:39:7:47 | AsmOperandNamed |
 | gen_asm_expr.rs:6:9:7:59 | AsmExpr | 1 | gen_asm_expr.rs:7:50:7:58 | AsmOperandNamed |
diff --git a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
index 11cc082dae04..e802491c3262 100644
--- a/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/AsmExpr/AsmExpr.ql
@@ -4,6 +4,12 @@ import TestUtils
 
 query predicate instances(AsmExpr x) { toBeTested(x) and not x.isUnknown() }
 
+query predicate getAttributeMacroExpansion(AsmExpr x, MacroItems getAttributeMacroExpansion) {
+  toBeTested(x) and
+  not x.isUnknown() and
+  getAttributeMacroExpansion = x.getAttributeMacroExpansion()
+}
+
 query predicate getAsmPiece(AsmExpr x, int index, AsmPiece getAsmPiece) {
   toBeTested(x) and not x.isUnknown() and getAsmPiece = x.getAsmPiece(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/Cargo.lock b/rust/ql/test/extractor-tests/generated/ClosureBinder/Cargo.lock
deleted file mode 100644
index b9856cfaf77d..000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/Cargo.lock
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "test"
-version = "0.0.1"
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected
deleted file mode 100644
index dfd2bd58d077..000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-instances
-| gen_closure_binder.rs:7:21:7:43 | ClosureBinder |
-getGenericParamList
-| gen_closure_binder.rs:7:21:7:43 | ClosureBinder | gen_closure_binder.rs:7:24:7:43 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql b/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
deleted file mode 100644
index d204c5fbde18..000000000000
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/ClosureBinder.ql
+++ /dev/null
@@ -1,9 +0,0 @@
-// generated by codegen, do not edit
-import codeql.rust.elements
-import TestUtils
-
-query predicate instances(ClosureBinder x) { toBeTested(x) and not x.isUnknown() }
-
-query predicate getGenericParamList(ClosureBinder x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
-}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
index 041669861b93..d7ae60022b1c 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.expected
@@ -2,30 +2,35 @@ instances
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | yes | isStatic: | no |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | isAsync: | yes | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | yes |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | isAsync: | no | isConst: | no | isGen: | no | isMove: | no | isStatic: | no |
 getParamList
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:5:5:7 | ParamList |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:10:6:17 | ParamList |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:11:7:21 | ParamList |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:5:9:7 | ParamList |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:13:11:15 | ParamList |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | gen_closure_expr.rs:9:5:9:7 | ParamList |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | gen_closure_expr.rs:11:12:11:14 | ParamList |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:29:12:34 | ParamList |
 getAttr
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:8:6:8:17 | Attr |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:10:6:10:17 | Attr |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:8:5:8:16 | Attr |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | 0 | gen_closure_expr.rs:10:5:10:16 | Attr |
 getParam
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | 0 | gen_closure_expr.rs:5:6:5:6 | ... |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | 0 | gen_closure_expr.rs:6:11:6:16 | ...: i32 |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 0 | gen_closure_expr.rs:7:12:7:17 | ...: i32 |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | 1 | gen_closure_expr.rs:7:20:7:20 | ... |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:9:6:9:6 | ... |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | 0 | gen_closure_expr.rs:11:14:11:14 | ... |
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | 0 | gen_closure_expr.rs:9:6:9:6 | ... |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | 0 | gen_closure_expr.rs:11:13:11:13 | ... |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | 0 | gen_closure_expr.rs:12:30:12:33 | ...: T |
 getBody
 | gen_closure_expr.rs:5:5:5:13 | \|...\| ... | gen_closure_expr.rs:5:9:5:13 | ... + ... |
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:26:6:34 | { ... } |
 | gen_closure_expr.rs:7:5:7:27 | \|...\| ... | gen_closure_expr.rs:7:23:7:27 | ... + ... |
-| gen_closure_expr.rs:8:6:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
-| gen_closure_expr.rs:10:6:11:23 | \|...\| ... | gen_closure_expr.rs:11:17:11:23 | YieldExpr |
-getClosureBinder
+| gen_closure_expr.rs:8:5:9:15 | \|...\| ... | gen_closure_expr.rs:9:9:9:15 | YieldExpr |
+| gen_closure_expr.rs:10:5:11:22 | \|...\| ... | gen_closure_expr.rs:11:16:11:22 | YieldExpr |
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:36:14:5 | { ... } |
+getForBinder
+| gen_closure_expr.rs:12:5:14:5 | \|...\| ... | gen_closure_expr.rs:12:5:12:27 | for<...> |
 getRetType
 | gen_closure_expr.rs:6:5:6:34 | \|...\| ... | gen_closure_expr.rs:6:19:6:24 | RetTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
index acf3b1306776..296eae114856 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/ClosureExpr.ql
@@ -37,8 +37,8 @@ query predicate getBody(ClosureExpr x, Expr getBody) {
   toBeTested(x) and not x.isUnknown() and getBody = x.getBody()
 }
 
-query predicate getClosureBinder(ClosureExpr x, ClosureBinder getClosureBinder) {
-  toBeTested(x) and not x.isUnknown() and getClosureBinder = x.getClosureBinder()
+query predicate getForBinder(ClosureExpr x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getRetType(ClosureExpr x, RetTypeRepr getRetType) {
diff --git a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs b/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
index 4c0c6067aac6..a9d1c5a2aeaa 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/ClosureExpr/gen_closure_expr.rs
@@ -5,8 +5,11 @@ fn test_closure_expr() -> () {
     |x| x + 1;
     move |x: i32| -> i32 { x + 1 };
     async |x: i32, y| x + y;
-     #[coroutine]
+    #[coroutine]
     |x| yield x;
-     #[coroutine]
-     static |x| yield x;
+    #[coroutine]
+    static |x| yield x;
+    for<T: std::fmt::Debug> |x: T| {
+        println!("{:?}", x);
+    };
 }
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.expected b/rust/ql/test/extractor-tests/generated/Const/Const.expected
index 64b20c95e261..cc1f282193fc 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.expected
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.expected
@@ -1,7 +1,5 @@
 instances
 | gen_const.rs:4:5:7:22 | Const | isConst: | yes | isDefault: | no | hasImplementation: | yes |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Const/Const.ql b/rust/ql/test/extractor-tests/generated/Const/Const.ql
index ef88f980fc0a..70420980d67d 100644
--- a/rust/ql/test/extractor-tests/generated/Const/Const.ql
+++ b/rust/ql/test/extractor-tests/generated/Const/Const.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 }
 
-query predicate getExtendedCanonicalPath(Const x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Const x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Const x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
index 45154c93e487..de3c33c0a7c3 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.expected
@@ -1,7 +1,5 @@
 instances
 | gen_enum.rs:4:5:7:34 | enum E |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
index e5c4c12693e9..0aa1bda8041e 100644
--- a/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
+++ b/rust/ql/test/extractor-tests/generated/Enum/Enum.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Enum x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Enum x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Enum x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Enum x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
index 8e061f24a562..1083af0cbcfe 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAbi
 | gen_extern_block.rs:7:5:9:5 | ExternBlock | gen_extern_block.rs:7:5:7:14 | Abi |
diff --git a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
index 2f07e5dfcae3..9769e173593c 100644
--- a/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternBlock/ExternBlock.ql
@@ -9,14 +9,6 @@ query predicate instances(ExternBlock x, string isUnsafe__label, string isUnsafe
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(ExternBlock x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(ExternBlock x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(ExternBlock x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
index 6e1b1a84e1ae..07b1cf161d2f 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.expected
@@ -1,7 +1,5 @@
 instances
 | gen_extern_crate.rs:4:5:7:23 | ExternCrate |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
index b0c2c372896e..2898d60f487a 100644
--- a/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
+++ b/rust/ql/test/extractor-tests/generated/ExternCrate/ExternCrate.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(ExternCrate x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(ExternCrate x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(ExternCrate x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(ExternCrate x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected
new file mode 100644
index 000000000000..34274dddb8b3
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.expected
@@ -0,0 +1,4 @@
+instances
+| gen_for_binder.rs:7:21:7:43 | for<...> |
+getGenericParamList
+| gen_for_binder.rs:7:21:7:43 | for<...> | gen_for_binder.rs:7:24:7:43 | <...> |
diff --git a/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql
new file mode 100644
index 000000000000..7e577cb1be27
--- /dev/null
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/ForBinder.ql
@@ -0,0 +1,9 @@
+// generated by codegen, do not edit
+import codeql.rust.elements
+import TestUtils
+
+query predicate instances(ForBinder x) { toBeTested(x) and not x.isUnknown() }
+
+query predicate getGenericParamList(ForBinder x, GenericParamList getGenericParamList) {
+  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+}
diff --git a/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs b/rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
similarity index 68%
rename from rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
rename to rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
index 6328368c5e17..c37e16793f27 100644
--- a/rust/ql/test/extractor-tests/generated/ClosureBinder/gen_closure_binder.rs
+++ b/rust/ql/test/extractor-tests/generated/ForBinder/gen_for_binder.rs
@@ -1,7 +1,7 @@
 // generated by codegen, do not edit
 
-fn test_closure_binder() -> () {
-    // A closure binder, specifying lifetime or type parameters for a closure.
+fn test_for_binder() -> () {
+    // A for binder, specifying lifetime or type parameters for a closure or a type.
     // 
     // For example:
     let print_any = for<T: std::fmt::Debug> |x: T| {
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
index 8f5ac12ec364..11c4d0212a7a 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.expected
@@ -1,6 +1,6 @@
 instances
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr |
-getGenericParamList
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | gen_for_type_repr.rs:9:15:9:18 | <...> |
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr |
+getForBinder
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr | gen_for_type_repr.rs:7:21:7:27 | for<...> |
 getTypeRepr
-| gen_for_type_repr.rs:9:12:9:41 | ForTypeRepr | gen_for_type_repr.rs:9:20:9:41 | Fn |
+| gen_for_type_repr.rs:7:21:7:46 | ForTypeRepr | gen_for_type_repr.rs:7:29:7:46 | FnPtrTypeRepr |
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
index 398a317a3ddc..9a485ca6d749 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/ForTypeRepr.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 query predicate instances(ForTypeRepr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getGenericParamList(ForTypeRepr x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(ForTypeRepr x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getTypeRepr(ForTypeRepr x, TypeRepr getTypeRepr) {
diff --git a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
index 49cd9e5c1abf..99072c25bcf8 100644
--- a/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
+++ b/rust/ql/test/extractor-tests/generated/ForTypeRepr/gen_for_type_repr.rs
@@ -1,14 +1,9 @@
 // generated by codegen, do not edit
 
 fn test_for_type_repr() -> () {
-    // A higher-ranked trait bound.
+    // A function pointer type with a `for` modifier.
     // 
     // For example:
-    fn foo<T>(value: T)
-    where
-        T: for<'a> Fn(&'a str) -> &'a str
-    //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    {
-        // ...
-    }
+    type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+    //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.expected b/rust/ql/test/extractor-tests/generated/Function/Function.expected
index db434cf918d6..7a91b7aefe62 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.expected
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.expected
@@ -1,12 +1,6 @@
 instances
 | gen_function.rs:3:1:4:38 | fn foo | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | yes |
 | gen_function.rs:7:5:7:13 | fn bar | isAsync: | no | isConst: | no | isDefault: | no | isGen: | no | isUnsafe: | no | hasImplementation: | no |
-getExtendedCanonicalPath
-| gen_function.rs:3:1:4:38 | fn foo | crate::gen_function::foo |
-| gen_function.rs:7:5:7:13 | fn bar | crate::gen_function::Trait::bar |
-getCrateOrigin
-| gen_function.rs:3:1:4:38 | fn foo | repo::test |
-| gen_function.rs:7:5:7:13 | fn bar | repo::test |
 getAttributeMacroExpansion
 getParamList
 | gen_function.rs:3:1:4:38 | fn foo | gen_function.rs:4:7:4:14 | ParamList |
diff --git a/rust/ql/test/extractor-tests/generated/Function/Function.ql b/rust/ql/test/extractor-tests/generated/Function/Function.ql
index 4f76623cb20c..c4e480d4d13c 100644
--- a/rust/ql/test/extractor-tests/generated/Function/Function.ql
+++ b/rust/ql/test/extractor-tests/generated/Function/Function.ql
@@ -23,14 +23,6 @@ query predicate instances(
   if x.hasImplementation() then hasImplementation = "yes" else hasImplementation = "no"
 }
 
-query predicate getExtendedCanonicalPath(Function x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Function x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Function x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
index 2a47a4e20f68..ec5e5705529a 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.expected
@@ -1,7 +1,5 @@
 instances
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | isConst: | no | isDefault: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAssocItemList
 | gen_impl.rs:4:5:9:5 | impl MyTrait for MyType { ... } | gen_impl.rs:7:29:9:5 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
index c64bae752c3e..1d73e09a1a7e 100644
--- a/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
+++ b/rust/ql/test/extractor-tests/generated/Impl/Impl.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Impl x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Impl x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Impl x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
index 67d330d937e1..d6887babe7eb 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.expected
@@ -1,5 +1,7 @@
 instances
-| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr |
-getTailExpr
-| gen_macro_block_expr.rs:5:14:5:28 | MacroBlockExpr | gen_macro_block_expr.rs:5:14:5:28 | { ... } |
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr |
 getStatement
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | 0 | gen_macro_block_expr.rs:13:5:13:13 | let ... = 40 |
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | 1 | gen_macro_block_expr.rs:13:5:13:13 | ExprStmt |
+getTailExpr
+| gen_macro_block_expr.rs:13:5:13:13 | MacroBlockExpr | gen_macro_block_expr.rs:13:5:13:13 | x |
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
index 82502ad4ec0d..bae6d7d1f62c 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/MacroBlockExpr.ql
@@ -4,10 +4,10 @@ import TestUtils
 
 query predicate instances(MacroBlockExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getTailExpr(MacroBlockExpr x, Expr getTailExpr) {
-  toBeTested(x) and not x.isUnknown() and getTailExpr = x.getTailExpr()
-}
-
 query predicate getStatement(MacroBlockExpr x, int index, Stmt getStatement) {
   toBeTested(x) and not x.isUnknown() and getStatement = x.getStatement(index)
 }
+
+query predicate getTailExpr(MacroBlockExpr x, Expr getTailExpr) {
+  toBeTested(x) and not x.isUnknown() and getTailExpr = x.getTailExpr()
+}
diff --git a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
index 035b7ddc98c6..62a408411e8a 100644
--- a/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/MacroBlockExpr/gen_macro_block_expr.rs
@@ -1,6 +1,14 @@
 // generated by codegen, do not edit
 
-// A sequence of statements generated by a `MacroCall`. For example:
-fn main() {
-    println!("Hello, world!"); // This macro expands into a list of statements
+fn test_macro_block_expr() -> () {
+    // A sequence of statements generated by a `MacroCall`. For example:
+    macro_rules! my_macro {
+        () => {
+            let mut x = 40;
+            x += 2;
+            x
+        };
+    }
+    
+    my_macro!();  // this macro expands to a sequence of statements (and an expression)
 }
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
index 0fae1d5e49da..e73178f5a4fb 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.expected
@@ -1,13 +1,11 @@
 instances
 | gen_macro_call.rs:7:5:7:29 | println!... |
 | gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getPath
 | gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:5:7:11 | println |
-| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:5:7:29 | ...::format_args_nl |
+| gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:5:7:12 | ...::format_args_nl |
 getTokenTree
 | gen_macro_call.rs:7:5:7:29 | println!... | gen_macro_call.rs:7:13:7:29 | TokenTree |
 | gen_macro_call.rs:7:14:7:28 | ...::format_args_nl!... | gen_macro_call.rs:7:14:7:28 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
index 48fddccf341e..5081eca422e2 100644
--- a/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroCall/MacroCall.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroCall x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroCall x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroCall x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroCall x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
index b9b6ddc10cd1..ba510853f06b 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_def.rs:4:5:9:5 | MacroDef |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getArgs
 | gen_macro_def.rs:4:5:9:5 | MacroDef | gen_macro_def.rs:7:25:7:39 | TokenTree |
diff --git a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
index e85173597cb6..18aece7ccb5a 100644
--- a/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroDef/MacroDef.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroDef x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroDef x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroDef x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroDef x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
index 90daafd58170..156893a07eba 100644
--- a/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroItems/MacroItems.expected
@@ -1,7 +1,7 @@
 instances
-| gen_macro_items.rs:5:5:5:38 | MacroItems |
+| gen_macro_items.rs:5:5:5:12 | MacroItems |
 | gen_macro_items.rs:13:12:13:14 | MacroItems |
 getItem
-| gen_macro_items.rs:5:5:5:38 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
-| gen_macro_items.rs:5:5:5:38 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
+| gen_macro_items.rs:5:5:5:12 | MacroItems | 0 | gen_macro_items.rs:5:5:5:38 | use ...::Path |
+| gen_macro_items.rs:5:5:5:12 | MacroItems | 1 | gen_macro_items.rs:5:5:5:38 | fn get_parent |
 | gen_macro_items.rs:13:12:13:14 | MacroItems | 0 | gen_macro_items.rs:13:12:13:14 | impl ...::Debug for Bar::<...> { ... } |
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
index 4bfb98220f23..cb40220291a9 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.expected
@@ -1,7 +1,5 @@
 instances
 | gen_macro_rules.rs:4:5:9:5 | MacroRules |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getName
diff --git a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
index ef051f77c9ee..4dc862c73d72 100644
--- a/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
+++ b/rust/ql/test/extractor-tests/generated/MacroRules/MacroRules.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(MacroRules x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(MacroRules x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(MacroRules x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(MacroRules x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
index 61054a3841ad..0eedcc70b5d2 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.expected
@@ -8,8 +8,6 @@ getAttr
 getArg
 | gen_method_call_expr.rs:5:5:5:13 | x.foo(...) | 0 | gen_method_call_expr.rs:5:11:5:12 | 42 |
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | 0 | gen_method_call_expr.rs:6:23:6:24 | 42 |
-getResolvedPath
-getResolvedCrateOrigin
 getGenericArgList
 | gen_method_call_expr.rs:6:5:6:25 | x.foo(...) | gen_method_call_expr.rs:6:10:6:21 | <...> |
 getIdentifier
diff --git a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
index 73ddf8e7d2e8..d1b6d5a13046 100644
--- a/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/MethodCallExpr/MethodCallExpr.ql
@@ -16,14 +16,6 @@ query predicate getArg(MethodCallExpr x, int index, Expr getArg) {
   toBeTested(x) and not x.isUnknown() and getArg = x.getArg(index)
 }
 
-query predicate getResolvedPath(MethodCallExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(MethodCallExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getGenericArgList(MethodCallExpr x, GenericArgList getGenericArgList) {
   toBeTested(x) and not x.isUnknown() and getGenericArgList = x.getGenericArgList()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.expected b/rust/ql/test/extractor-tests/generated/Module/Module.expected
index 9fcf65f56580..d0259df5ee81 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.expected
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.expected
@@ -2,14 +2,6 @@ instances
 | gen_module.rs:3:1:4:8 | mod foo |
 | gen_module.rs:5:1:7:1 | mod bar |
 | lib.rs:1:1:1:19 | mod gen_module |
-getExtendedCanonicalPath
-| gen_module.rs:3:1:4:8 | mod foo | crate::gen_module::foo |
-| gen_module.rs:5:1:7:1 | mod bar | crate::gen_module::bar |
-| lib.rs:1:1:1:19 | mod gen_module | crate::gen_module |
-getCrateOrigin
-| gen_module.rs:3:1:4:8 | mod foo | repo::test |
-| gen_module.rs:5:1:7:1 | mod bar | repo::test |
-| lib.rs:1:1:1:19 | mod gen_module | repo::test |
 getAttributeMacroExpansion
 getAttr
 getItemList
diff --git a/rust/ql/test/extractor-tests/generated/Module/Module.ql b/rust/ql/test/extractor-tests/generated/Module/Module.ql
index 48a141bbc1fe..8bd4b7af92f5 100644
--- a/rust/ql/test/extractor-tests/generated/Module/Module.ql
+++ b/rust/ql/test/extractor-tests/generated/Module/Module.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Module x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Module x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Module x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Module x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
index e3e1a8d3900a..7e8d7f8718b1 100644
--- a/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
+++ b/rust/ql/test/extractor-tests/generated/NeverTypeRepr/NeverTypeRepr.expected
@@ -1,2 +1,2 @@
 | gen_never_type_repr.rs:7:17:7:17 | ! |
-| gen_never_type_repr.rs:7:21:7:28 | ! |
+| gen_never_type_repr.rs:7:21:7:26 | ! |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
index 5a2df7ee29f9..9a26eca5b66d 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.expected
@@ -5,8 +5,6 @@ instances
 | gen_path_expr.rs:7:13:7:20 | ...::foo |
 | gen_path_expr.rs:8:13:8:36 | ...::foo |
 | gen_path_pat.rs:5:11:5:11 | x |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path.rs:6:5:6:12 | ...::bar | gen_path.rs:6:5:6:12 | ...::bar |
 | gen_path_expr.rs:5:13:5:20 | variable | gen_path_expr.rs:5:13:5:20 | variable |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
index 70bff600ace0..87017b801ec5 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathExpr.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(PathExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(PathExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(PathExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(PathExpr x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
index 9bcce9035582..d211f4c05d2f 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.expected
@@ -1,6 +1,4 @@
 instances
 | gen_path_pat.rs:6:9:6:16 | ...::Bar |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_path_pat.rs:6:9:6:16 | ...::Bar | gen_path_pat.rs:6:9:6:16 | ...::Bar |
diff --git a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
index 9c5a874cabf5..78138ed5d82d 100644
--- a/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
+++ b/rust/ql/test/extractor-tests/generated/Path/PathPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(PathPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(PathPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(PathPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(PathPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.expected b/rust/ql/test/extractor-tests/generated/Static/Static.expected
index ee87d07a2c18..074c6600f8c1 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.expected
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.expected
@@ -1,7 +1,5 @@
 instances
 | gen_static.rs:4:5:7:23 | Static | isMut: | no | isStatic: | yes | isUnsafe: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getBody
diff --git a/rust/ql/test/extractor-tests/generated/Static/Static.ql b/rust/ql/test/extractor-tests/generated/Static/Static.ql
index 58ade5f044fc..dfd2dd939182 100644
--- a/rust/ql/test/extractor-tests/generated/Static/Static.ql
+++ b/rust/ql/test/extractor-tests/generated/Static/Static.ql
@@ -16,14 +16,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Static x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Static x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Static x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
index ad34c13babe6..040a035c249c 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.expected
@@ -1,7 +1,5 @@
 instances
 | gen_struct.rs:4:5:8:5 | struct Point |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
index 185c1125f5c5..25a980701c57 100644
--- a/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
+++ b/rust/ql/test/extractor-tests/generated/Struct/Struct.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Struct x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Struct x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Struct x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Struct x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
index 477aa732ece0..988d3ec6299f 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.expected
@@ -1,17 +1,15 @@
 instances
 | gen_struct_expr.rs:5:17:5:34 | Foo {...} |
 | gen_struct_expr.rs:6:18:6:38 | Foo {...} |
-| gen_struct_expr.rs:7:5:7:22 | Foo {...} |
-| gen_struct_expr.rs:8:5:8:14 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} |
 getPath
 | 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 |
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} | gen_struct_expr.rs:7:13:7:15 | Foo |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} | gen_struct_expr.rs:8:5:8:7 | Foo |
 getStructExprFieldList
 | 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 |
+| gen_struct_expr.rs:7:13:7:30 | Foo {...} | gen_struct_expr.rs:7:17:7:30 | StructExprFieldList |
+| gen_struct_expr.rs:8:5:8:20 | Foo {...} | gen_struct_expr.rs:8:9:8:20 | StructExprFieldList |
diff --git a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
index 4a71efa31ee6..858a0812024f 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/StructExpr.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(StructExpr x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(StructExpr x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(StructExpr x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(StructExpr x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
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
index 7e43d1000511..680c9dac9cfd 100644
--- a/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/StructExpr/gen_struct_expr.rs
@@ -4,6 +4,6 @@ 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;
+    let n = Foo { a: 1, b: 2 }.b;
+    Foo { a: m, .. } = second;
 }
diff --git a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
index 894e52fb1965..5f1a7bed8442 100644
--- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.expected
@@ -1,8 +1,6 @@
 instances
 | gen_struct_pat.rs:6:9:6:26 | Foo {...} |
 | gen_struct_pat.rs:7:9:7:18 | Foo {...} |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | 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.ql b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
index 4aad29aede9c..d117695d0902 100644
--- a/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
+++ b/rust/ql/test/extractor-tests/generated/StructPat/StructPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(StructPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(StructPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(StructPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(StructPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
index ff60871f40b3..e0f91737d5e9 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.expected
@@ -1,12 +1,6 @@
 instances
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | isAuto: | no | isUnsafe: | no |
 | gen_trait.rs:10:1:10:57 | trait Foo | isAuto: | no | isUnsafe: | no |
-getExtendedCanonicalPath
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | crate::gen_trait::Frobinizable |
-| gen_trait.rs:10:1:10:57 | trait Foo | crate::gen_trait::Foo |
-getCrateOrigin
-| gen_trait.rs:3:1:8:1 | trait Frobinizable | repo::test |
-| gen_trait.rs:10:1:10:57 | trait Foo | repo::test |
 getAttributeMacroExpansion
 getAssocItemList
 | gen_trait.rs:3:1:8:1 | trait Frobinizable | gen_trait.rs:4:20:8:1 | AssocItemList |
diff --git a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
index 35725fcd5261..20e9b7f1e240 100644
--- a/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
+++ b/rust/ql/test/extractor-tests/generated/Trait/Trait.ql
@@ -13,14 +13,6 @@ query predicate instances(
   if x.isUnsafe() then isUnsafe = "yes" else isUnsafe = "no"
 }
 
-query predicate getExtendedCanonicalPath(Trait x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Trait x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Trait x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
index f8fc16280369..5daf06da1c37 100644
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.expected
@@ -1,7 +1,5 @@
 instances
 | gen_trait_alias.rs:7:5:7:26 | TraitAlias |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
index 2d65541f50ce..c0fee75678af 100644
--- a/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TraitAlias/TraitAlias.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(TraitAlias x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(TraitAlias x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(TraitAlias x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(TraitAlias x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
index 3a35afd6630d..aac93393b5fc 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/TupleExpr.expected
@@ -1,9 +1,9 @@
 instances
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr |
 getAttr
 getField
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 0 | gen_tuple_expr.rs:5:6:5:6 | 1 |
-| gen_tuple_expr.rs:5:5:5:14 | TupleExpr | 1 | gen_tuple_expr.rs:5:9:5:13 | "one" |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 0 | gen_tuple_expr.rs:6:6:6:6 | 2 |
-| gen_tuple_expr.rs:6:5:6:14 | TupleExpr | 1 | gen_tuple_expr.rs:6:9:6:13 | "two" |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr | 0 | gen_tuple_expr.rs:5:18:5:18 | 1 |
+| gen_tuple_expr.rs:5:17:5:26 | TupleExpr | 1 | gen_tuple_expr.rs:5:21:5:25 | "one" |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr | 0 | gen_tuple_expr.rs:6:14:6:14 | 2 |
+| gen_tuple_expr.rs:6:13:6:22 | TupleExpr | 1 | gen_tuple_expr.rs:6:17:6:21 | "two" |
diff --git a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs b/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
index 7aa2b235a804..f9f5cf49c3d6 100644
--- a/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
+++ b/rust/ql/test/extractor-tests/generated/TupleExpr/gen_tuple_expr.rs
@@ -2,6 +2,7 @@
 
 fn test_tuple_expr() -> () {
     // A tuple expression. For example:
-    (1, "one");
-    (2, "two")[0] = 3;
+    let tuple = (1, "one");
+    let n = (2, "two").0;
+    let (a, b) = tuple;
 }
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
index c5ce2e2640a0..dcefb6cb7a49 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.expected
@@ -2,8 +2,6 @@ instances
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) |
 | gen_tuple_struct_pat.rs:8:9:8:17 | Tuple(...) |
-getResolvedPath
-getResolvedCrateOrigin
 getPath
 | gen_tuple_struct_pat.rs:6:9:6:27 | Tuple(...) | gen_tuple_struct_pat.rs:6:9:6:13 | Tuple |
 | gen_tuple_struct_pat.rs:7:9:7:20 | Tuple(...) | gen_tuple_struct_pat.rs:7:9:7:13 | Tuple |
diff --git a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
index 408c892ea3cd..e6bde1d82aaa 100644
--- a/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
+++ b/rust/ql/test/extractor-tests/generated/TupleStructPat/TupleStructPat.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(TupleStructPat x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getResolvedPath(TupleStructPat x, string getResolvedPath) {
-  toBeTested(x) and not x.isUnknown() and getResolvedPath = x.getResolvedPath()
-}
-
-query predicate getResolvedCrateOrigin(TupleStructPat x, string getResolvedCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getResolvedCrateOrigin = x.getResolvedCrateOrigin()
-}
-
 query predicate getPath(TupleStructPat x, Path getPath) {
   toBeTested(x) and not x.isUnknown() and getPath = x.getPath()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
index b9b584857525..e3b0620ddcd8 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.expected
@@ -1,8 +1,6 @@
 instances
 | gen_type_alias.rs:4:5:5:26 | type Point | isDefault: | no |
 | gen_type_alias.rs:8:9:8:20 | type Output | isDefault: | no |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getGenericParamList
diff --git a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
index 014bd119d331..925be1f44a30 100644
--- a/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeAlias/TypeAlias.ql
@@ -9,14 +9,6 @@ query predicate instances(TypeAlias x, string isDefault__label, string isDefault
   if x.isDefault() then isDefault = "yes" else isDefault = "no"
 }
 
-query predicate getExtendedCanonicalPath(TypeAlias x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(TypeAlias x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(TypeAlias x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
index e0ed9fcdd6ca..f987837ffe3d 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.expected
@@ -1,6 +1,10 @@
 instances
 | gen_type_bound.rs:7:15:7:19 | TypeBound | isAsync: | no | isConst: | no |
+| gen_type_bound.rs:9:24:9:44 | TypeBound | isAsync: | no | isConst: | no |
+getForBinder
+| gen_type_bound.rs:9:24:9:44 | TypeBound | gen_type_bound.rs:9:24:9:30 | for<...> |
 getLifetime
 getTypeRepr
 | gen_type_bound.rs:7:15:7:19 | TypeBound | gen_type_bound.rs:7:15:7:19 | Debug |
+| gen_type_bound.rs:9:24:9:44 | TypeBound | gen_type_bound.rs:9:32:9:44 | From::<...> |
 getUseBoundGenericArgs
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
index e4b2b6127dc3..40d44dff8c88 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/TypeBound.ql
@@ -13,6 +13,10 @@ query predicate instances(
   if x.isConst() then isConst = "yes" else isConst = "no"
 }
 
+query predicate getForBinder(TypeBound x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
+}
+
 query predicate getLifetime(TypeBound x, Lifetime getLifetime) {
   toBeTested(x) and not x.isUnknown() and getLifetime = x.getLifetime()
 }
diff --git a/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
index 9e182cbeefcc..7b4c9e4f4236 100644
--- a/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
+++ b/rust/ql/test/extractor-tests/generated/TypeBound/gen_type_bound.rs
@@ -6,4 +6,6 @@ fn test_type_bound() -> () {
     // For example:
     fn foo<T: Debug>(t: T) {}
     //        ^^^^^
+    fn bar(value: impl for<'a> From<&'a str>) {}
+    //                 ^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.expected b/rust/ql/test/extractor-tests/generated/Union/Union.expected
index 110643aeac99..b83a39b708da 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.expected
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.expected
@@ -1,7 +1,5 @@
 instances
 | gen_union.rs:4:5:7:32 | union U |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getDeriveMacroExpansion
 getAttr
diff --git a/rust/ql/test/extractor-tests/generated/Union/Union.ql b/rust/ql/test/extractor-tests/generated/Union/Union.ql
index 147a8fca09e8..9c555d1e5906 100644
--- a/rust/ql/test/extractor-tests/generated/Union/Union.ql
+++ b/rust/ql/test/extractor-tests/generated/Union/Union.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Union x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Union x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Union x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Union x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.expected b/rust/ql/test/extractor-tests/generated/Use/Use.expected
index 23057c691dcb..079cb9e8aa38 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.expected
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.expected
@@ -1,7 +1,5 @@
 instances
 | gen_use.rs:4:5:5:34 | use ...::HashMap |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttributeMacroExpansion
 getAttr
 getUseTree
diff --git a/rust/ql/test/extractor-tests/generated/Use/Use.ql b/rust/ql/test/extractor-tests/generated/Use/Use.ql
index bfce3bcc89c4..e6940ef9e245 100644
--- a/rust/ql/test/extractor-tests/generated/Use/Use.ql
+++ b/rust/ql/test/extractor-tests/generated/Use/Use.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Use x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Use x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Use x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttributeMacroExpansion(Use x, MacroItems getAttributeMacroExpansion) {
   toBeTested(x) and
   not x.isUnknown() and
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
index ad970afe530d..4c67e1684b00 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.expected
@@ -2,8 +2,6 @@ instances
 | gen_variant.rs:7:14:7:14 | A |
 | gen_variant.rs:7:17:7:22 | B |
 | gen_variant.rs:7:25:7:36 | C |
-getExtendedCanonicalPath
-getCrateOrigin
 getAttr
 getDiscriminant
 getFieldList
diff --git a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
index 088f610637a9..61c142671163 100644
--- a/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
+++ b/rust/ql/test/extractor-tests/generated/Variant/Variant.ql
@@ -4,14 +4,6 @@ import TestUtils
 
 query predicate instances(Variant x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getExtendedCanonicalPath(Variant x, string getExtendedCanonicalPath) {
-  toBeTested(x) and not x.isUnknown() and getExtendedCanonicalPath = x.getExtendedCanonicalPath()
-}
-
-query predicate getCrateOrigin(Variant x, string getCrateOrigin) {
-  toBeTested(x) and not x.isUnknown() and getCrateOrigin = x.getCrateOrigin()
-}
-
 query predicate getAttr(Variant x, int index, Attr getAttr) {
   toBeTested(x) and not x.isUnknown() and getAttr = x.getAttr(index)
 }
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
index 4980b912b860..41b5739818cd 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.expected
@@ -1,11 +1,15 @@
 instances
 | gen_where_pred.rs:7:36:7:43 | WherePred |
 | gen_where_pred.rs:7:46:7:53 | WherePred |
-getGenericParamList
+| gen_where_pred.rs:9:31:9:54 | WherePred |
+getForBinder
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:31:9:37 | for<...> |
 getLifetime
 getTypeRepr
 | gen_where_pred.rs:7:36:7:43 | WherePred | gen_where_pred.rs:7:36:7:36 | T |
 | gen_where_pred.rs:7:46:7:53 | WherePred | gen_where_pred.rs:7:46:7:46 | U |
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:39:9:39 | T |
 getTypeBoundList
 | gen_where_pred.rs:7:36:7:43 | WherePred | gen_where_pred.rs:7:39:7:43 | TypeBoundList |
 | gen_where_pred.rs:7:46:7:53 | WherePred | gen_where_pred.rs:7:49:7:53 | TypeBoundList |
+| gen_where_pred.rs:9:31:9:54 | WherePred | gen_where_pred.rs:9:42:9:54 | TypeBoundList |
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
index 3d1ecb7339db..957c2b45edfa 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
+++ b/rust/ql/test/extractor-tests/generated/WherePred/WherePred.ql
@@ -4,8 +4,8 @@ import TestUtils
 
 query predicate instances(WherePred x) { toBeTested(x) and not x.isUnknown() }
 
-query predicate getGenericParamList(WherePred x, GenericParamList getGenericParamList) {
-  toBeTested(x) and not x.isUnknown() and getGenericParamList = x.getGenericParamList()
+query predicate getForBinder(WherePred x, ForBinder getForBinder) {
+  toBeTested(x) and not x.isUnknown() and getForBinder = x.getForBinder()
 }
 
 query predicate getLifetime(WherePred x, Lifetime getLifetime) {
diff --git a/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
index 48a6b7bf2564..8e037453bf77 100644
--- a/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
+++ b/rust/ql/test/extractor-tests/generated/WherePred/gen_where_pred.rs
@@ -6,4 +6,6 @@ fn test_where_pred() -> () {
     // For example:
     fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
     //                             ^^^^^^^^  ^^^^^^^^
+    fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+    //                        ^^^^^^^^^^^^^^^^^^^^^^^^
 }
diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
index 2d13c81bdab8..5c472b07a14f 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/ExtractionConsistency.expected
@@ -1,3 +1,2 @@
 extractionWarning
-| included/included.rs:1:1:1:1 | semantic analyzer unavailable (not loaded as its own module, probably included by `!include`) |
-| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |
+| macro_expansion.rs:56:9:56:31 | macro expansion failed for 'concat' |
diff --git a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
index 675d607c9fde..354e6e0a4d28 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,10 +1,8 @@
 multipleCallTargets
-| proc_macro.rs:15:5:17:5 | ...::new(...) |
-| proc_macro.rs:25:5:28:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
-| proc_macro.rs:41:5:49:5 | ...::new(...) |
+| proc_macro.rs:15:5:15:10 | ...::new(...) |
+| proc_macro.rs:25:5:25:10 | ...::new(...) |
+| proc_macro.rs:41:5:41:10 | ...::new(...) |
+| proc_macro.rs:41:5:41:10 | ...::new(...) |
+| proc_macro.rs:41:5:41:10 | ...::new(...) |
+| proc_macro.rs:41:5:41:10 | ...::new(...) |
 | proc_macro.rs:44:27:44:30 | ...::to_tokens(...) |
-multiplePathResolutions
-| macro_expansion.rs:1:5:1:14 | proc_macro |
diff --git a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
index 79576902a43d..fbd7a97918ab 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/PrintAst.expected
@@ -1532,16 +1532,6 @@ proc_macro.rs:
 #   15|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   16|                               getTokenTree(): [TokenTree] TokenTree
 #   16|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   15|                                     getPath(): [Path] ...::quote_token_with_context
-#   15|                                       getQualifier(): [Path] $crate
-#   15|                                         getSegment(): [PathSegment] $crate
-#   15|                                           getIdentifier(): [NameRef] $crate
-#   15|                                       getSegment(): [PathSegment] quote_token_with_context
-#   15|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   16|                                     getTokenTree(): [TokenTree] TokenTree
-#   15|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                 getStatement(0): [ExprStmt] ExprStmt
 #   16|                                   getExpr(): [MacroExpr] MacroExpr
 #   16|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -1633,16 +1623,6 @@ proc_macro.rs:
 #   15|                                                             getIdentifier(): [NameRef] pounded_var_names_with_context
 #   16|                                                         getTokenTree(): [TokenTree] TokenTree
 #   16|                                                         getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                           getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                             getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
-#   15|                                                               getPath(): [Path] ...::pounded_var_with_context
-#   15|                                                                 getQualifier(): [Path] $crate
-#   15|                                                                   getSegment(): [PathSegment] $crate
-#   15|                                                                     getIdentifier(): [NameRef] $crate
-#   15|                                                                 getSegment(): [PathSegment] pounded_var_with_context
-#   15|                                                                   getIdentifier(): [NameRef] pounded_var_with_context
-#   16|                                                               getTokenTree(): [TokenTree] TokenTree
-#   15|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                                           getStatement(0): [ExprStmt] ExprStmt
 #   15|                                                             getExpr(): [MacroExpr] MacroExpr
 #   15|                                                               getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
@@ -1748,6 +1728,16 @@ proc_macro.rs:
 #   15|                                                                                     getIdentifier(): [NameRef] i
 #   15|                                                                             getPat(): [IdentPat] has_iter
 #   15|                                                                               getName(): [Name] has_iter
+#   16|                                                           getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                             getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
+#   15|                                                               getPath(): [Path] ...::pounded_var_with_context
+#   15|                                                                 getQualifier(): [Path] $crate
+#   15|                                                                   getSegment(): [PathSegment] $crate
+#   15|                                                                     getIdentifier(): [NameRef] $crate
+#   15|                                                                 getSegment(): [PathSegment] pounded_var_with_context
+#   15|                                                                   getIdentifier(): [NameRef] pounded_var_with_context
+#   16|                                                               getTokenTree(): [TokenTree] TokenTree
+#   15|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                             getStatement(3): [LetStmt] let _ = has_iter
 #   15|                                               getInitializer(): [PathExpr,VariableAccess] has_iter
 #   15|                                                 getPath(): [Path] has_iter
@@ -1788,16 +1778,6 @@ proc_macro.rs:
 #   15|                                                                   getIdentifier(): [NameRef] pounded_var_names_with_context
 #   16|                                                               getTokenTree(): [TokenTree] TokenTree
 #   16|                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                                 getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                                   getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
-#   15|                                                                     getPath(): [Path] ...::pounded_var_with_context
-#   15|                                                                       getQualifier(): [Path] $crate
-#   15|                                                                         getSegment(): [PathSegment] $crate
-#   15|                                                                           getIdentifier(): [NameRef] $crate
-#   15|                                                                       getSegment(): [PathSegment] pounded_var_with_context
-#   15|                                                                         getIdentifier(): [NameRef] pounded_var_with_context
-#   16|                                                                     getTokenTree(): [TokenTree] TokenTree
-#   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                                                 getStatement(0): [ExprStmt] ExprStmt
 #   15|                                                                   getExpr(): [MacroExpr] MacroExpr
 #   15|                                                                     getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
@@ -1911,6 +1891,16 @@ proc_macro.rs:
 #   15|                                                                                           getName(): [Name] None
 #   16|                                                                                   getPat(): [IdentPat] items
 #   16|                                                                                     getName(): [Name] items
+#   16|                                                                 getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                                   getMacroCall(): [MacroCall] ...::pounded_var_with_context!...
+#   15|                                                                     getPath(): [Path] ...::pounded_var_with_context
+#   15|                                                                       getQualifier(): [Path] $crate
+#   15|                                                                         getSegment(): [PathSegment] $crate
+#   15|                                                                           getIdentifier(): [NameRef] $crate
+#   15|                                                                       getSegment(): [PathSegment] pounded_var_with_context
+#   15|                                                                         getIdentifier(): [NameRef] pounded_var_with_context
+#   16|                                                                     getTokenTree(): [TokenTree] TokenTree
+#   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                                   getTailExpr(): [MacroExpr] MacroExpr
 #   16|                                                     getMacroCall(): [MacroCall] ...::quote_each_token!...
 #   15|                                                       getPath(): [Path] ...::quote_each_token
@@ -1931,16 +1921,6 @@ proc_macro.rs:
 #   15|                                                                 getIdentifier(): [NameRef] quote_tokens_with_context
 #   16|                                                             getTokenTree(): [TokenTree] TokenTree
 #   16|                                                             getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   16|                                                               getTailExpr(): [MacroExpr] MacroExpr
-#   16|                                                                 getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   15|                                                                   getPath(): [Path] ...::quote_token_with_context
-#   15|                                                                     getQualifier(): [Path] $crate
-#   15|                                                                       getSegment(): [PathSegment] $crate
-#   15|                                                                         getIdentifier(): [NameRef] $crate
-#   15|                                                                     getSegment(): [PathSegment] quote_token_with_context
-#   15|                                                                       getIdentifier(): [NameRef] quote_token_with_context
-#   16|                                                                   getTokenTree(): [TokenTree] TokenTree
-#   15|                                                                   getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   16|                                                               getStatement(0): [ExprStmt] ExprStmt
 #   16|                                                                 getExpr(): [MacroExpr] MacroExpr
 #   16|                                                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -2041,6 +2021,16 @@ proc_macro.rs:
 #   15|                                                                         getIdentifier(): [NameRef] quote_token_with_context
 #   16|                                                                     getTokenTree(): [TokenTree] TokenTree
 #   15|                                                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   16|                                                               getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                                                 getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   15|                                                                   getPath(): [Path] ...::quote_token_with_context
+#   15|                                                                     getQualifier(): [Path] $crate
+#   15|                                                                       getSegment(): [PathSegment] $crate
+#   15|                                                                         getIdentifier(): [NameRef] $crate
+#   15|                                                                     getSegment(): [PathSegment] quote_token_with_context
+#   15|                                                                       getIdentifier(): [NameRef] quote_token_with_context
+#   16|                                                                   getTokenTree(): [TokenTree] TokenTree
+#   15|                                                                   getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                                               getCondition(): [BooleanLiteralExpr] true
 #   16|                                 getStatement(4): [ExprStmt] ExprStmt
 #   16|                                   getExpr(): [MacroExpr] MacroExpr
@@ -2086,6 +2076,16 @@ proc_macro.rs:
 #   15|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   16|                                       getTokenTree(): [TokenTree] TokenTree
 #   15|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   16|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   16|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   15|                                     getPath(): [Path] ...::quote_token_with_context
+#   15|                                       getQualifier(): [Path] $crate
+#   15|                                         getSegment(): [PathSegment] $crate
+#   15|                                           getIdentifier(): [NameRef] $crate
+#   15|                                       getSegment(): [PathSegment] quote_token_with_context
+#   15|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   16|                                     getTokenTree(): [TokenTree] TokenTree
+#   15|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   15|                   getTailExpr(): [PathExpr] _s
 #   15|                     getPath(): [Path] _s
 #   15|                       getSegment(): [PathSegment] _s
@@ -2369,16 +2369,6 @@ proc_macro.rs:
 #   25|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   26|                               getTokenTree(): [TokenTree] TokenTree
 #   26|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   27|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   27|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   25|                                     getPath(): [Path] ...::quote_token_with_context
-#   25|                                       getQualifier(): [Path] $crate
-#   25|                                         getSegment(): [PathSegment] $crate
-#   25|                                           getIdentifier(): [NameRef] $crate
-#   25|                                       getSegment(): [PathSegment] quote_token_with_context
-#   25|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   27|                                     getTokenTree(): [TokenTree] TokenTree
-#   25|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   26|                                 getStatement(0): [ExprStmt] ExprStmt
 #   26|                                   getExpr(): [MacroExpr] MacroExpr
 #   26|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -2524,6 +2514,16 @@ proc_macro.rs:
 #   25|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   27|                                       getTokenTree(): [TokenTree] TokenTree
 #   25|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   27|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   27|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   25|                                     getPath(): [Path] ...::quote_token_with_context
+#   25|                                       getQualifier(): [Path] $crate
+#   25|                                         getSegment(): [PathSegment] $crate
+#   25|                                           getIdentifier(): [NameRef] $crate
+#   25|                                       getSegment(): [PathSegment] quote_token_with_context
+#   25|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   27|                                     getTokenTree(): [TokenTree] TokenTree
+#   25|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   25|                   getTailExpr(): [PathExpr] _s
 #   25|                     getPath(): [Path] _s
 #   25|                       getSegment(): [PathSegment] _s
@@ -2825,16 +2825,6 @@ proc_macro.rs:
 #   41|                                   getIdentifier(): [NameRef] quote_tokens_with_context
 #   42|                               getTokenTree(): [TokenTree] TokenTree
 #   42|                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   44|                                 getTailExpr(): [MacroExpr] MacroExpr
-#   44|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   41|                                     getPath(): [Path] ...::quote_token_with_context
-#   41|                                       getQualifier(): [Path] $crate
-#   41|                                         getSegment(): [PathSegment] $crate
-#   41|                                           getIdentifier(): [NameRef] $crate
-#   41|                                       getSegment(): [PathSegment] quote_token_with_context
-#   41|                                         getIdentifier(): [NameRef] quote_token_with_context
-#   44|                                     getTokenTree(): [TokenTree] TokenTree
-#   41|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   42|                                 getStatement(0): [ExprStmt] ExprStmt
 #   42|                                   getExpr(): [MacroExpr] MacroExpr
 #   42|                                     getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -3443,16 +3433,6 @@ proc_macro.rs:
 #   41|                                                                             getIdentifier(): [NameRef] quote_tokens_with_context
 #   45|                                                                         getTokenTree(): [TokenTree] TokenTree
 #   45|                                                                         getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
-#   45|                                                                           getTailExpr(): [MacroExpr] MacroExpr
-#   45|                                                                             getMacroCall(): [MacroCall] ...::quote_token_with_context!...
-#   41|                                                                               getPath(): [Path] ...::quote_token_with_context
-#   41|                                                                                 getQualifier(): [Path] $crate
-#   41|                                                                                   getSegment(): [PathSegment] $crate
-#   41|                                                                                     getIdentifier(): [NameRef] $crate
-#   41|                                                                                 getSegment(): [PathSegment] quote_token_with_context
-#   41|                                                                                   getIdentifier(): [NameRef] quote_token_with_context
-#   45|                                                                               getTokenTree(): [TokenTree] TokenTree
-#   41|                                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   45|                                                                           getStatement(0): [ExprStmt] ExprStmt
 #   45|                                                                             getExpr(): [MacroExpr] MacroExpr
 #   45|                                                                               getMacroCall(): [MacroCall] ...::quote_token_with_context!...
@@ -3869,6 +3849,16 @@ proc_macro.rs:
 #   41|                                                                                     getIdentifier(): [NameRef] quote_token_with_context
 #   45|                                                                                 getTokenTree(): [TokenTree] TokenTree
 #   41|                                                                                 getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   45|                                                                           getTailExpr(): [MacroExpr] MacroExpr
+#   45|                                                                             getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   41|                                                                               getPath(): [Path] ...::quote_token_with_context
+#   41|                                                                                 getQualifier(): [Path] $crate
+#   41|                                                                                   getSegment(): [PathSegment] $crate
+#   41|                                                                                     getIdentifier(): [NameRef] $crate
+#   41|                                                                                 getSegment(): [PathSegment] quote_token_with_context
+#   41|                                                                                   getIdentifier(): [NameRef] quote_token_with_context
+#   45|                                                                               getTokenTree(): [TokenTree] TokenTree
+#   41|                                                                               getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   41|                                                             getTailExpr(): [PathExpr] _s
 #   41|                                                               getPath(): [Path] _s
 #   41|                                                                 getSegment(): [PathSegment] _s
@@ -3905,6 +3895,16 @@ proc_macro.rs:
 #   41|                                           getIdentifier(): [NameRef] quote_token_with_context
 #   44|                                       getTokenTree(): [TokenTree] TokenTree
 #   41|                                       getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
+#   44|                                 getTailExpr(): [MacroExpr] MacroExpr
+#   44|                                   getMacroCall(): [MacroCall] ...::quote_token_with_context!...
+#   41|                                     getPath(): [Path] ...::quote_token_with_context
+#   41|                                       getQualifier(): [Path] $crate
+#   41|                                         getSegment(): [PathSegment] $crate
+#   41|                                           getIdentifier(): [NameRef] $crate
+#   41|                                       getSegment(): [PathSegment] quote_token_with_context
+#   41|                                         getIdentifier(): [NameRef] quote_token_with_context
+#   44|                                     getTokenTree(): [TokenTree] TokenTree
+#   41|                                     getMacroCallExpansion(): [MacroBlockExpr] MacroBlockExpr
 #   41|                   getTailExpr(): [PathExpr] _s
 #   41|                     getPath(): [Path] _s
 #   41|                       getSegment(): [PathSegment] _s
diff --git a/rust/ql/test/extractor-tests/macro-expansion/test.expected b/rust/ql/test/extractor-tests/macro-expansion/test.expected
index ad2cfe5a9b83..deb522796c9e 100644
--- a/rust/ql/test/extractor-tests/macro-expansion/test.expected
+++ b/rust/ql/test/extractor-tests/macro-expansion/test.expected
@@ -32,18 +32,18 @@ macro_calls
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
 | macro_expansion.rs:33:9:33:15 | hello!... | macro_expansion.rs:31:5:31:16 | MacroBlockExpr |
-| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:13 | MacroItems |
+| macro_expansion.rs:44:5:44:13 | def_x!... | macro_expansion.rs:44:5:44:10 | MacroItems |
 | macro_expansion.rs:53:9:53:25 | concat!... | macro_expansion.rs:53:17:53:24 | "xy" |
 | macro_expansion.rs:55:9:58:5 | my_macro!... | macro_expansion.rs:56:9:57:13 | MacroExpr |
 | macro_expansion.rs:56:9:57:13 | ...::format_args!... | macro_expansion.rs:56:9:57:13 | FormatArgsExpr |
 | macro_expansion.rs:56:9:57:13 | format!... | macro_expansion.rs:56:9:57:13 | ...::must_use(...) |
 | macro_expansion.rs:61:1:61:33 | concat!... | macro_expansion.rs:61:1:61:33 | "Hello world!" |
 | macro_expansion.rs:61:1:61:33 | include!... | macro_expansion.rs:61:1:61:33 | MacroItems |
-| macro_expansion.rs:70:16:70:24 | my_int!... | macro_expansion.rs:70:16:70:24 | i32 |
-| macro_expansion.rs:71:12:71:20 | my_int!... | macro_expansion.rs:71:12:71:20 | i32 |
-| macro_expansion.rs:72:10:72:18 | my_int!... | macro_expansion.rs:72:10:72:18 | i32 |
-| macro_expansion.rs:76:14:76:22 | my_int!... | macro_expansion.rs:76:14:76:22 | i32 |
-| macro_expansion.rs:79:12:79:20 | my_int!... | macro_expansion.rs:79:12:79:20 | i32 |
+| macro_expansion.rs:70:16:70:24 | my_int!... | macro_expansion.rs:70:16:70:22 | i32 |
+| macro_expansion.rs:71:12:71:20 | my_int!... | macro_expansion.rs:71:12:71:18 | i32 |
+| macro_expansion.rs:72:10:72:18 | my_int!... | macro_expansion.rs:72:10:72:16 | i32 |
+| macro_expansion.rs:76:14:76:22 | my_int!... | macro_expansion.rs:76:14:76:20 | i32 |
+| macro_expansion.rs:79:12:79:20 | my_int!... | macro_expansion.rs:79:12:79:18 | i32 |
 unexpanded_macro_calls
 | included/included.rs:2:9:2:39 | concat!... |
 | macro_expansion.rs:5:9:5:35 | concat!... |
@@ -51,5 +51,4 @@ unexpanded_macro_calls
 | macro_expansion.rs:56:9:56:31 | concat!... |
 | macro_expansion.rs:63:9:63:32 | include_str!... |
 warnings
-| included/included.rs:1:1:1:1 | semantic analyzer unavailable (not loaded as its own module, probably included by `!include`) |
-| macro_expansion.rs:56:9:56:31 | macro expansion failed: could not resolve macro 'concat' |
+| macro_expansion.rs:56:9:56:31 | macro expansion failed for 'concat' |
diff --git a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
index 96ea01f56d90..80357ae29f86 100644
--- a/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
+++ b/rust/ql/test/library-tests/controlflow/BasicBlocks.expected
@@ -693,14 +693,14 @@ dominates
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:26:443:36 | Some(...) |
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | 2 |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | 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:32:462:32 | _ |
@@ -738,20 +738,20 @@ dominates
 | test.rs:513:17:513:41 | ExprStmt | test.rs:513:17:513:41 | ExprStmt |
 | test.rs:523:5:525:5 | enter fn add_two | test.rs:523:5:525:5 | enter fn add_two |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | if ... {...} |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | ExprStmt |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | enter fn panic_cold_explicit |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | if ... {...} |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1382,12 +1382,12 @@ postDominance
 | test.rs:453:5:458:5 | enter fn or_pattern_3 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:454:9:457:9 | match a { ... } |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | 2 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 |
 | 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 { ... } |
@@ -1422,20 +1422,20 @@ postDominance
 | test.rs:513:17:513:41 | ExprStmt | test.rs:513:17:513:41 | ExprStmt |
 | test.rs:523:5:525:5 | enter fn add_two | test.rs:523:5:525:5 | enter fn add_two |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | ExprStmt |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | enter fn panic_cold_explicit |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | ExprStmt |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | enter fn panic_cold_explicit |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
-| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:49 | ExprStmt |
+| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:19 | ExprStmt |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(false)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | if ... {...} |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:539:5:548:5 | enter fn const_block_panic |
 | test.rs:541:9:546:9 | if false {...} | test.rs:541:9:546:9 | if false {...} |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | enter fn panic_cold_explicit |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | enter fn panic_cold_explicit |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:551:1:556:1 | enter fn dead_code |
 | test.rs:553:9:553:17 | ExprStmt | test.rs:553:9:553:17 | ExprStmt |
@@ -1698,9 +1698,9 @@ immediateDominator
 | test.rs:443:18:443:21 | true | test.rs:443:13:443:22 | Some(...) |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:13:443:22 | Some(...) |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:5:458:5 | enter fn or_pattern_3 |
-| test.rs:455:13:455:25 | 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:455:13:455:25 | 2 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
+| test.rs:455:13:455:23 | 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:455:13:455:23 | 2 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 |
 | test.rs:461:9:464:9 | match pair { ... } | 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:460:5:465:5 | enter fn irrefutable_pattern_and_dead_code |
@@ -1713,7 +1713,7 @@ immediateDominator
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:511:28:516:9 | enter { ... } |
 | test.rs:512:13:514:13 | if b {...} | test.rs:511:28:516:9 | enter { ... } |
 | test.rs:513:17:513:41 | ExprStmt | test.rs:511:28:516:9 | enter { ... } |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:21:533:48 | [boolean(true)] ! ... |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:529:5:537:5 | enter fn const_block_assert |
 | test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:529:5:537:5 | enter fn const_block_assert |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:529:5:537:5 | enter fn const_block_assert |
@@ -1925,10 +1925,10 @@ controls
 | 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 |
+| test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:13:533:19 | ExprStmt | false |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} | false |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt | true |
 | test.rs:568:1:582:1 | enter fn labelled_block1 | test.rs:571:9:573:9 | if ... {...} | false |
@@ -2083,7 +2083,7 @@ successor
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(false)] ! ... | true |
 | test.rs:529:5:537:5 | enter fn const_block_assert | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:539:5:548:5 | enter fn const_block_panic | test.rs:541:9:546:9 | if false {...} | false |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:553:9:553:17 | ExprStmt | true |
 | test.rs:568:1:582:1 | enter fn labelled_block1 | test.rs:571:9:573:9 | if ... {...} | false |
@@ -2242,10 +2242,10 @@ joinBlockPredecessor
 | test.rs:443:13:443:36 | ... \| ... | test.rs:443:26:443:36 | Some(...) | 1 |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:13:443:22 | Some(...) | 1 |
 | test.rs:443:26:443:36 | Some(...) | test.rs:443:18:443:21 | true | 0 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(false)] 1 \| 2 | 0 |
-| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | 1 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 | 1 |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:13:455:25 | 2 | 0 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(false)] 1 \| 2 | 0 |
+| test.rs:454:9:457:9 | match a { ... } | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | 1 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:453:5:458:5 | enter fn or_pattern_3 | 1 |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:13:455:23 | 2 | 0 |
 | 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:476:9:480:9 | match e { ... } | test.rs:477:32:477:32 | _ | 0 |
@@ -2255,7 +2255,7 @@ joinBlockPredecessor
 | test.rs:487:13:487:14 | TupleExpr | test.rs:487:13:487:14 | TupleExpr | 0 |
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:512:13:514:13 | if b {...} | 1 |
 | test.rs:511:28:516:9 | exit { ... } (normal) | test.rs:513:17:513:41 | ExprStmt | 0 |
-| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:49 | ExprStmt | 1 |
+| test.rs:533:21:533:48 | if ... {...} | test.rs:533:13:533:19 | ExprStmt | 1 |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | [boolean(false)] ! ... | 0 |
 | 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 |
diff --git a/rust/ql/test/library-tests/controlflow/Cfg.expected b/rust/ql/test/library-tests/controlflow/Cfg.expected
index d49c8e689850..d8b2972ca525 100644
--- a/rust/ql/test/library-tests/controlflow/Cfg.expected
+++ b/rust/ql/test/library-tests/controlflow/Cfg.expected
@@ -391,39 +391,39 @@ edges
 | test.rs:170:16:170:20 | cond2 | test.rs:171:17:171:30 | ExprStmt | true |
 | test.rs:170:16:170:20 | cond2 | test.rs:173:17:173:30 | ExprStmt | false |
 | test.rs:170:22:172:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} |  |
-| test.rs:171:17:171:29 | ...::_print | test.rs:171:26:171:28 | "1\\n" |  |
+| test.rs:171:17:171:24 | ...::_print | test.rs:171:26:171:28 | "1\\n" |  |
 | test.rs:171:17:171:29 | MacroExpr | test.rs:170:22:172:13 | { ... } |  |
 | test.rs:171:17:171:29 | println!... | test.rs:171:17:171:29 | MacroExpr |  |
 | test.rs:171:17:171:30 | ExprStmt | test.rs:171:26:171:28 | ExprStmt |  |
 | test.rs:171:26:171:28 | "1\\n" | test.rs:171:26:171:28 | FormatArgsExpr |  |
 | test.rs:171:26:171:28 | ...::_print(...) | test.rs:171:26:171:28 | { ... } |  |
 | test.rs:171:26:171:28 | ...::format_args_nl!... | test.rs:171:26:171:28 | MacroExpr |  |
-| test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:29 | ...::_print |  |
+| test.rs:171:26:171:28 | ExprStmt | test.rs:171:17:171:24 | ...::_print |  |
 | test.rs:171:26:171:28 | FormatArgsExpr | test.rs:171:26:171:28 | ...::format_args_nl!... |  |
 | test.rs:171:26:171:28 | MacroBlockExpr | test.rs:171:17:171:29 | println!... |  |
 | test.rs:171:26:171:28 | MacroExpr | test.rs:171:26:171:28 | ...::_print(...) |  |
 | test.rs:171:26:171:28 | { ... } | test.rs:171:26:171:28 | MacroBlockExpr |  |
 | test.rs:172:20:174:13 | { ... } | test.rs:170:13:174:13 | if cond2 {...} else {...} |  |
-| test.rs:173:17:173:29 | ...::_print | test.rs:173:26:173:28 | "2\\n" |  |
+| test.rs:173:17:173:24 | ...::_print | test.rs:173:26:173:28 | "2\\n" |  |
 | test.rs:173:17:173:29 | MacroExpr | test.rs:172:20:174:13 | { ... } |  |
 | test.rs:173:17:173:29 | println!... | test.rs:173:17:173:29 | MacroExpr |  |
 | test.rs:173:17:173:30 | ExprStmt | test.rs:173:26:173:28 | ExprStmt |  |
 | test.rs:173:26:173:28 | "2\\n" | test.rs:173:26:173:28 | FormatArgsExpr |  |
 | test.rs:173:26:173:28 | ...::_print(...) | test.rs:173:26:173:28 | { ... } |  |
 | test.rs:173:26:173:28 | ...::format_args_nl!... | test.rs:173:26:173:28 | MacroExpr |  |
-| test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:29 | ...::_print |  |
+| test.rs:173:26:173:28 | ExprStmt | test.rs:173:17:173:24 | ...::_print |  |
 | test.rs:173:26:173:28 | FormatArgsExpr | test.rs:173:26:173:28 | ...::format_args_nl!... |  |
 | test.rs:173:26:173:28 | MacroBlockExpr | test.rs:173:17:173:29 | println!... |  |
 | test.rs:173:26:173:28 | MacroExpr | test.rs:173:26:173:28 | ...::_print(...) |  |
 | test.rs:173:26:173:28 | { ... } | test.rs:173:26:173:28 | MacroBlockExpr |  |
-| test.rs:175:13:175:25 | ...::_print | test.rs:175:22:175:24 | "3\\n" |  |
+| test.rs:175:13:175:20 | ...::_print | test.rs:175:22:175:24 | "3\\n" |  |
 | test.rs:175:13:175:25 | MacroExpr | test.rs:169:18:176:9 | { ... } |  |
 | test.rs:175:13:175:25 | println!... | test.rs:175:13:175:25 | MacroExpr |  |
 | test.rs:175:13:175:26 | ExprStmt | test.rs:175:22:175:24 | ExprStmt |  |
 | test.rs:175:22:175:24 | "3\\n" | test.rs:175:22:175:24 | FormatArgsExpr |  |
 | test.rs:175:22:175:24 | ...::_print(...) | test.rs:175:22:175:24 | { ... } |  |
 | test.rs:175:22:175:24 | ...::format_args_nl!... | test.rs:175:22:175:24 | MacroExpr |  |
-| test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:25 | ...::_print |  |
+| test.rs:175:22:175:24 | ExprStmt | test.rs:175:13:175:20 | ...::_print |  |
 | test.rs:175:22:175:24 | FormatArgsExpr | test.rs:175:22:175:24 | ...::format_args_nl!... |  |
 | test.rs:175:22:175:24 | MacroBlockExpr | test.rs:175:13:175:25 | println!... |  |
 | test.rs:175:22:175:24 | MacroExpr | test.rs:175:22:175:24 | ...::_print(...) |  |
@@ -896,14 +896,14 @@ edges
 | 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 | 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" |  |
+| test.rs:363:32:363:37 | ...::panic_fmt | test.rs:363:39:363:53 | "Expected some" |  |
 | test.rs:363:32:363:54 | MacroExpr | test.rs:363:30:363:56 | { ... } |  |
 | test.rs:363:32:363:54 | panic!... | test.rs:363:32:363:54 | MacroExpr |  |
 | test.rs:363:39:363:53 | "Expected some" | test.rs:363:39:363:53 | FormatArgsExpr |  |
 | test.rs:363:39:363:53 | ...::const_format_args!... | test.rs:363:39:363:53 | MacroExpr |  |
 | test.rs:363:39:363:53 | ...::panic_2021!... | test.rs:363:39:363:53 | MacroExpr |  |
 | test.rs:363:39:363:53 | ...::panic_fmt(...) | test.rs:363:39:363:53 | { ... } |  |
-| test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:54 | ...::panic_fmt |  |
+| test.rs:363:39:363:53 | ExprStmt | test.rs:363:32:363:37 | ...::panic_fmt |  |
 | test.rs:363:39:363:53 | FormatArgsExpr | test.rs:363:39:363:53 | ...::const_format_args!... |  |
 | test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:32:363:54 | panic!... |  |
 | test.rs:363:39:363:53 | MacroBlockExpr | test.rs:363:39:363:53 | ...::panic_2021!... |  |
@@ -1125,15 +1125,15 @@ edges
 | test.rs:453:36:458:5 | { ... } | test.rs:453:5:458:5 | exit fn or_pattern_3 (normal) |  |
 | test.rs:454:9:457:9 | match a { ... } | test.rs:453:36:458:5 | { ... } |  |
 | test.rs:454:15:454:15 | a | test.rs:455:13:455:25 | MacroPat |  |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | 1 |  |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | 2 | no-match |
-| test.rs:455:13:455:25 | 1 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | match |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | 2 |  |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(false)] 1 \| 2 | no-match |
-| test.rs:455:13:455:25 | 2 | test.rs:455:13:455:25 | [match(true)] 1 \| 2 | match |
-| test.rs:455:13:455:25 | MacroPat | test.rs:455:13:455:25 | 1 | match |
-| test.rs:455:13:455:25 | [match(false)] 1 \| 2 | test.rs:456:13:456:13 | _ | no-match |
-| test.rs:455:13:455:25 | [match(true)] 1 \| 2 | test.rs:455:30:455:30 | 3 | match |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | 1 |  |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | 2 | no-match |
+| test.rs:455:13:455:23 | 1 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | match |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | 2 |  |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(false)] 1 \| 2 | no-match |
+| test.rs:455:13:455:23 | 2 | test.rs:455:13:455:23 | [match(true)] 1 \| 2 | match |
+| test.rs:455:13:455:23 | [match(false)] 1 \| 2 | test.rs:456:13:456:13 | _ | no-match |
+| test.rs:455:13:455:23 | [match(true)] 1 \| 2 | test.rs:455:30:455:30 | 3 | match |
+| test.rs:455:13:455:25 | MacroPat | test.rs:455:13:455:23 | 1 | match |
 | test.rs:455:30:455:30 | 3 | test.rs:454:9:457:9 | match a { ... } |  |
 | test.rs:456:13:456:13 | _ | test.rs:456:18:456:18 | 4 | match |
 | test.rs:456:18:456:18 | 4 | test.rs:454:9:457:9 | match a { ... } |  |
@@ -1181,14 +1181,14 @@ edges
 | test.rs:494:5:496:5 | enter fn say_hello | test.rs:495:9:495:34 | ExprStmt |  |
 | test.rs:494:5:496:5 | exit fn say_hello (normal) | test.rs:494:5:496:5 | exit fn say_hello |  |
 | test.rs:494:26:496:5 | { ... } | test.rs:494:5:496:5 | exit fn say_hello (normal) |  |
-| test.rs:495:9:495:33 | ...::_print | test.rs:495:18:495:32 | "hello, world!\\n" |  |
+| test.rs:495:9:495:16 | ...::_print | test.rs:495:18:495:32 | "hello, world!\\n" |  |
 | test.rs:495:9:495:33 | MacroExpr | test.rs:494:26:496:5 | { ... } |  |
 | test.rs:495:9:495:33 | println!... | test.rs:495:9:495:33 | MacroExpr |  |
 | test.rs:495:9:495:34 | ExprStmt | test.rs:495:18:495:32 | ExprStmt |  |
 | test.rs:495:18:495:32 | "hello, world!\\n" | test.rs:495:18:495:32 | FormatArgsExpr |  |
 | test.rs:495:18:495:32 | ...::_print(...) | test.rs:495:18:495:32 | { ... } |  |
 | test.rs:495:18:495:32 | ...::format_args_nl!... | test.rs:495:18:495:32 | MacroExpr |  |
-| test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:33 | ...::_print |  |
+| test.rs:495:18:495:32 | ExprStmt | test.rs:495:9:495:16 | ...::_print |  |
 | test.rs:495:18:495:32 | FormatArgsExpr | test.rs:495:18:495:32 | ...::format_args_nl!... |  |
 | test.rs:495:18:495:32 | MacroBlockExpr | test.rs:495:9:495:33 | println!... |  |
 | test.rs:495:18:495:32 | MacroExpr | test.rs:495:18:495:32 | ...::_print(...) |  |
@@ -1205,14 +1205,14 @@ edges
 | test.rs:499:26:501:9 | enter { ... } | test.rs:500:13:500:42 | ExprStmt |  |
 | test.rs:499:26:501:9 | exit { ... } (normal) | test.rs:499:26:501:9 | exit { ... } |  |
 | test.rs:499:26:501:9 | { ... } | test.rs:499:13:499:22 | say_godbye |  |
-| test.rs:500:13:500:41 | ...::_print | test.rs:500:22:500:40 | "godbye, everyone!\\n" |  |
+| test.rs:500:13:500:20 | ...::_print | test.rs:500:22:500:40 | "godbye, everyone!\\n" |  |
 | test.rs:500:13:500:41 | MacroExpr | test.rs:499:26:501:9 | exit { ... } (normal) |  |
 | test.rs:500:13:500:41 | println!... | test.rs:500:13:500:41 | MacroExpr |  |
 | test.rs:500:13:500:42 | ExprStmt | test.rs:500:22:500:40 | ExprStmt |  |
 | test.rs:500:22:500:40 | "godbye, everyone!\\n" | test.rs:500:22:500:40 | FormatArgsExpr |  |
 | test.rs:500:22:500:40 | ...::_print(...) | test.rs:500:22:500:40 | { ... } |  |
 | test.rs:500:22:500:40 | ...::format_args_nl!... | test.rs:500:22:500:40 | MacroExpr |  |
-| test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:41 | ...::_print |  |
+| test.rs:500:22:500:40 | ExprStmt | test.rs:500:13:500:20 | ...::_print |  |
 | test.rs:500:22:500:40 | FormatArgsExpr | test.rs:500:22:500:40 | ...::format_args_nl!... |  |
 | test.rs:500:22:500:40 | MacroBlockExpr | test.rs:500:13:500:41 | println!... |  |
 | test.rs:500:22:500:40 | MacroExpr | test.rs:500:22:500:40 | ...::_print(...) |  |
@@ -1223,14 +1223,14 @@ edges
 | test.rs:502:31:504:9 | enter { ... } | test.rs:503:13:503:37 | ExprStmt |  |
 | test.rs:502:31:504:9 | exit { ... } (normal) | test.rs:502:31:504:9 | exit { ... } |  |
 | test.rs:502:31:504:9 | { ... } | test.rs:502:13:502:27 | say_how_are_you |  |
-| test.rs:503:13:503:36 | ...::_print | test.rs:503:22:503:35 | "how are you?\\n" |  |
+| test.rs:503:13:503:20 | ...::_print | test.rs:503:22:503:35 | "how are you?\\n" |  |
 | test.rs:503:13:503:36 | MacroExpr | test.rs:502:31:504:9 | exit { ... } (normal) |  |
 | test.rs:503:13:503:36 | println!... | test.rs:503:13:503:36 | MacroExpr |  |
 | test.rs:503:13:503:37 | ExprStmt | test.rs:503:22:503:35 | ExprStmt |  |
 | test.rs:503:22:503:35 | "how are you?\\n" | test.rs:503:22:503:35 | FormatArgsExpr |  |
 | test.rs:503:22:503:35 | ...::_print(...) | test.rs:503:22:503:35 | { ... } |  |
 | test.rs:503:22:503:35 | ...::format_args_nl!... | test.rs:503:22:503:35 | MacroExpr |  |
-| test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:36 | ...::_print |  |
+| test.rs:503:22:503:35 | ExprStmt | test.rs:503:13:503:20 | ...::_print |  |
 | test.rs:503:22:503:35 | FormatArgsExpr | test.rs:503:22:503:35 | ...::format_args_nl!... |  |
 | test.rs:503:22:503:35 | MacroBlockExpr | test.rs:503:13:503:36 | println!... |  |
 | test.rs:503:22:503:35 | MacroExpr | test.rs:503:22:503:35 | ...::_print(...) |  |
@@ -1288,23 +1288,23 @@ edges
 | test.rs:529:41:537:5 | { ... } | test.rs:529:5:537:5 | exit fn const_block_assert (normal) |  |
 | test.rs:532:9:534:9 | ExprStmt | test.rs:533:13:533:50 | ExprStmt |  |
 | test.rs:532:9:534:9 | { ... } | test.rs:536:9:536:10 | 42 |  |
-| test.rs:533:13:533:49 | ...::panic_2021!... | test.rs:533:13:533:49 | MacroExpr |  |
-| test.rs:533:13:533:49 | ...::panic_explicit | test.rs:533:13:533:49 | ...::panic_explicit(...) |  |
-| test.rs:533:13:533:49 | ...::panic_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | fn panic_cold_explicit |  |
-| test.rs:533:13:533:49 | ExprStmt | test.rs:533:13:533:49 | panic_cold_explicit |  |
-| test.rs:533:13:533:49 | MacroBlockExpr | test.rs:533:13:533:49 | ...::panic_2021!... |  |
+| test.rs:533:13:533:19 | ...::panic_2021!... | test.rs:533:13:533:19 | MacroExpr |  |
+| test.rs:533:13:533:19 | ...::panic_explicit | test.rs:533:13:533:19 | ...::panic_explicit(...) |  |
+| test.rs:533:13:533:19 | ...::panic_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | fn panic_cold_explicit |  |
+| test.rs:533:13:533:19 | ExprStmt | test.rs:533:13:533:19 | panic_cold_explicit |  |
+| test.rs:533:13:533:19 | MacroBlockExpr | test.rs:533:13:533:19 | ...::panic_2021!... |  |
+| test.rs:533:13:533:19 | MacroExpr | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | enter fn panic_cold_explicit | test.rs:533:13:533:19 | ...::panic_explicit |  |
+| test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:19 | exit fn panic_cold_explicit |  |
+| test.rs:533:13:533:19 | fn panic_cold_explicit | test.rs:533:13:533:19 | ExprStmt |  |
+| test.rs:533:13:533:19 | panic_cold_explicit | test.rs:533:13:533:19 | panic_cold_explicit(...) |  |
+| test.rs:533:13:533:19 | panic_cold_explicit(...) | test.rs:533:13:533:19 | { ... } |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | MacroBlockExpr |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:13:533:19 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:533:13:533:19 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:49 | MacroExpr | test.rs:532:9:534:9 | { ... } |  |
-| test.rs:533:13:533:49 | MacroExpr | test.rs:533:13:533:49 | { ... } |  |
 | test.rs:533:13:533:49 | assert!... | test.rs:533:13:533:49 | MacroExpr |  |
-| test.rs:533:13:533:49 | enter fn panic_cold_explicit | test.rs:533:13:533:49 | ...::panic_explicit |  |
-| test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) | test.rs:533:13:533:49 | exit fn panic_cold_explicit |  |
-| test.rs:533:13:533:49 | fn panic_cold_explicit | test.rs:533:13:533:49 | ExprStmt |  |
-| test.rs:533:13:533:49 | panic_cold_explicit | test.rs:533:13:533:49 | panic_cold_explicit(...) |  |
-| test.rs:533:13:533:49 | panic_cold_explicit(...) | test.rs:533:13:533:49 | { ... } |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | MacroBlockExpr |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:13:533:49 | exit fn panic_cold_explicit (normal) |  |
-| test.rs:533:13:533:49 | { ... } | test.rs:533:21:533:48 | if ... {...} |  |
 | test.rs:533:13:533:50 | ExprStmt | test.rs:533:21:533:42 | ...::size_of::<...> |  |
 | test.rs:533:21:533:42 | ...::size_of::<...> | test.rs:533:21:533:44 | ...::size_of::<...>(...) |  |
 | test.rs:533:21:533:44 | ...::size_of::<...>(...) | test.rs:533:48:533:48 | 0 |  |
@@ -1312,7 +1312,7 @@ edges
 | test.rs:533:21:533:48 | ... > ... | test.rs:533:21:533:48 | [boolean(true)] ! ... | false |
 | test.rs:533:21:533:48 | MacroBlockExpr | test.rs:533:13:533:49 | assert!... |  |
 | test.rs:533:21:533:48 | [boolean(false)] ! ... | test.rs:533:21:533:48 | if ... {...} | false |
-| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:49 | ExprStmt | true |
+| test.rs:533:21:533:48 | [boolean(true)] ! ... | test.rs:533:13:533:19 | ExprStmt | true |
 | test.rs:533:21:533:48 | if ... {...} | test.rs:533:21:533:48 | { ... } |  |
 | test.rs:533:21:533:48 | { ... } | test.rs:533:21:533:48 | MacroBlockExpr |  |
 | test.rs:533:48:533:48 | 0 | test.rs:533:21:533:48 | ... > ... |  |
@@ -1324,11 +1324,11 @@ edges
 | test.rs:541:9:546:9 | ExprStmt | test.rs:541:12:541:16 | false |  |
 | test.rs:541:9:546:9 | if false {...} | test.rs:547:9:547:9 | N |  |
 | test.rs:541:12:541:16 | false | test.rs:541:9:546:9 | if false {...} | false |
-| test.rs:544:17:544:24 | ...::panic_explicit | test.rs:544:17:544:24 | ...::panic_explicit(...) |  |
-| test.rs:544:17:544:24 | ...::panic_explicit(...) | test.rs:544:17:544:24 | { ... } |  |
-| test.rs:544:17:544:24 | enter fn panic_cold_explicit | test.rs:544:17:544:24 | ...::panic_explicit |  |
-| test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:24 | exit fn panic_cold_explicit |  |
-| test.rs:544:17:544:24 | { ... } | test.rs:544:17:544:24 | exit fn panic_cold_explicit (normal) |  |
+| test.rs:544:17:544:22 | ...::panic_explicit | test.rs:544:17:544:22 | ...::panic_explicit(...) |  |
+| test.rs:544:17:544:22 | ...::panic_explicit(...) | test.rs:544:17:544:22 | { ... } |  |
+| test.rs:544:17:544:22 | enter fn panic_cold_explicit | test.rs:544:17:544:22 | ...::panic_explicit |  |
+| test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) | test.rs:544:17:544:22 | exit fn panic_cold_explicit |  |
+| test.rs:544:17:544:22 | { ... } | test.rs:544:17:544:22 | exit fn panic_cold_explicit (normal) |  |
 | test.rs:547:9:547:9 | N | test.rs:539:35:548:5 | { ... } |  |
 | test.rs:551:1:556:1 | enter fn dead_code | test.rs:552:5:554:5 | ExprStmt |  |
 | test.rs:551:1:556:1 | exit fn dead_code (normal) | test.rs:551:1:556:1 | exit fn dead_code |  |
diff --git a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
index 3a830d7d36a6..86bd270ba935 100644
--- a/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
+++ b/rust/ql/test/library-tests/dataflow/local/DataFlowStep.expected
@@ -1,5 +1,6 @@
 localStep
-| file://:0:0:0:0 | [summary param] self in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[self].OptionalBarrier[normalize-path] in fn canonicalize |
+| file://:0:0:0:0 | [summary param] 0 in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[0].OptionalBarrier[normalize-path] in fn canonicalize |
+| file://:0:0:0:0 | [summary] read: Argument[self].Reference in fn canonicalize | file://:0:0:0:0 | [summary] read: Argument[self].Reference.OptionalBarrier[normalize-path] in fn canonicalize |
 | main.rs:4:11:4:11 | [SSA] i | main.rs:5:12:5:12 | i |
 | main.rs:4:11:4:11 | i | main.rs:4:11:4:11 | [SSA] i |
 | main.rs:4:11:4:11 | i | main.rs:4:11:4:11 | i |
@@ -909,8 +910,8 @@ localStep
 | main.rs:563:10:563:10 | b | main.rs:563:10:563:10 | receiver for b |
 | main.rs:563:10:563:10 | b | main.rs:564:20:564:20 | b |
 | main.rs:592:13:592:33 | result_questionmark(...) | main.rs:592:9:592:9 | _ |
-| main.rs:604:36:604:41 | ...::new(...) | main.rs:604:36:604:41 | MacroExpr |
-| main.rs:604:36:604:41 | [post] MacroExpr | main.rs:604:36:604:41 | [post] ...::new(...) |
+| main.rs:604:36:604:39 | ...::new(...) | main.rs:604:36:604:41 | MacroExpr |
+| main.rs:604:36:604:41 | [post] MacroExpr | main.rs:604:36:604:39 | [post] ...::new(...) |
 readStep
 | main.rs:50:9:50:15 | Some(...) | {EXTERNAL LOCATION} | Some | main.rs:50:14:50:14 | _ |
 | main.rs:104:11:104:11 | [post] receiver for i | file://:0:0:0:0 | &ref | main.rs:104:11:104:11 | [post] i |
diff --git a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
index 19b896ddee29..8448e7cd99a5 100644
--- a/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/CONSISTENCY/PathResolutionConsistency.expected
@@ -11,74 +11,68 @@ multipleCallTargets
 | test.rs:179:30:179:68 | ...::_print(...) |
 | test.rs:188:26:188:105 | ...::_print(...) |
 | test.rs:229:22:229:72 | ... .read_to_string(...) |
-| test.rs:483:22:483:50 | file.read_to_end(...) |
-| test.rs:489:22:489:53 | file.read_to_string(...) |
-| test.rs:610:18:610:38 | ...::_print(...) |
-| test.rs:615:18:615:45 | ...::_print(...) |
-| test.rs:619:25:619:49 | address.to_socket_addrs() |
-| test.rs:633:38:633:42 | ...::_print(...) |
-| test.rs:637:38:637:54 | ...::_print(...) |
-| test.rs:642:38:642:51 | ...::_print(...) |
-| test.rs:652:34:652:52 | ...::_print(...) |
-| test.rs:671:14:671:43 | ...::_print(...) |
-| test.rs:686:18:686:42 | ...::_print(...) |
-| test.rs:690:18:690:42 | ...::_print(...) |
-| test.rs:695:18:695:45 | ...::_print(...) |
-| test.rs:702:30:702:34 | ...::_print(...) |
-| test.rs:706:30:706:52 | ...::_print(...) |
-| test.rs:715:30:715:43 | ...::_print(...) |
-| test.rs:725:30:725:34 | ...::_print(...) |
-| test.rs:729:30:729:52 | ...::_print(...) |
-| test.rs:738:30:738:43 | ...::_print(...) |
-| test.rs:753:14:753:43 | ...::_print(...) |
-| test.rs:767:14:767:34 | ...::_print(...) |
-| test.rs:807:50:807:66 | ...::from(...) |
-| test.rs:807:50:807:66 | ...::from(...) |
-| test.rs:809:14:809:31 | ...::_print(...) |
-| test.rs:812:14:812:31 | ...::_print(...) |
-| test.rs:815:14:815:31 | ...::_print(...) |
-| test.rs:818:14:818:30 | ...::_print(...) |
-| test.rs:820:27:820:36 | ...::_print(...) |
-| test.rs:821:28:821:41 | ...::_print(...) |
-| test.rs:824:14:824:33 | ...::_print(...) |
-| test.rs:826:27:826:36 | ...::_print(...) |
-| test.rs:827:28:827:41 | ...::_print(...) |
-| test.rs:830:14:830:31 | ...::_print(...) |
-| test.rs:832:27:832:36 | ...::_print(...) |
-| test.rs:833:28:833:41 | ...::_print(...) |
-| test.rs:836:14:836:34 | ...::_print(...) |
-| test.rs:838:27:838:36 | ...::_print(...) |
-| test.rs:839:28:839:41 | ...::_print(...) |
-| test.rs:842:14:842:25 | ...::_print(...) |
-| test.rs:844:27:844:36 | ...::_print(...) |
-| test.rs:845:28:845:41 | ...::_print(...) |
-| test.rs:848:14:848:31 | ...::_print(...) |
-| test.rs:850:27:850:36 | ...::_print(...) |
-| test.rs:851:28:851:41 | ...::_print(...) |
-| test.rs:854:14:854:30 | ...::_print(...) |
-| test.rs:856:27:856:36 | ...::_print(...) |
-| test.rs:857:28:857:41 | ...::_print(...) |
-| test.rs:860:14:860:33 | ...::_print(...) |
-| test.rs:862:27:862:36 | ...::_print(...) |
-| test.rs:863:28:863:41 | ...::_print(...) |
-| test.rs:866:14:866:36 | ...::_print(...) |
-| test.rs:868:27:868:36 | ...::_print(...) |
-| test.rs:869:28:869:41 | ...::_print(...) |
-| test.rs:872:14:872:38 | ...::_print(...) |
-| test.rs:874:27:874:36 | ...::_print(...) |
-| test.rs:875:28:875:41 | ...::_print(...) |
-| test.rs:878:14:878:45 | ...::_print(...) |
-| test.rs:880:27:880:36 | ...::_print(...) |
-| test.rs:881:28:881:41 | ...::_print(...) |
-| test.rs:884:14:884:29 | ...::_print(...) |
-| test.rs:886:27:886:36 | ...::_print(...) |
-| test.rs:887:28:887:41 | ...::_print(...) |
-| test_futures_io.rs:35:26:35:63 | pinned.poll_read(...) |
-| test_futures_io.rs:62:22:62:50 | pinned.poll_fill_buf(...) |
-| test_futures_io.rs:69:23:69:67 | ... .poll_fill_buf(...) |
-| test_futures_io.rs:93:26:93:63 | pinned.poll_read(...) |
-| test_futures_io.rs:116:22:116:50 | pinned.poll_fill_buf(...) |
-| test_futures_io.rs:145:26:145:49 | ...::with_capacity(...) |
+| test.rs:697:18:697:38 | ...::_print(...) |
+| test.rs:702:18:702:45 | ...::_print(...) |
+| test.rs:720:38:720:42 | ...::_print(...) |
+| test.rs:724:38:724:54 | ...::_print(...) |
+| test.rs:729:38:729:51 | ...::_print(...) |
+| test.rs:739:34:739:52 | ...::_print(...) |
+| test.rs:758:14:758:43 | ...::_print(...) |
+| test.rs:773:18:773:42 | ...::_print(...) |
+| test.rs:777:18:777:42 | ...::_print(...) |
+| test.rs:782:18:782:45 | ...::_print(...) |
+| test.rs:789:30:789:34 | ...::_print(...) |
+| test.rs:793:30:793:52 | ...::_print(...) |
+| test.rs:802:30:802:43 | ...::_print(...) |
+| test.rs:812:30:812:34 | ...::_print(...) |
+| test.rs:816:30:816:52 | ...::_print(...) |
+| test.rs:825:30:825:43 | ...::_print(...) |
+| test.rs:840:14:840:43 | ...::_print(...) |
+| test.rs:854:14:854:34 | ...::_print(...) |
+| test.rs:894:50:894:66 | ...::from(...) |
+| test.rs:894:50:894:66 | ...::from(...) |
+| test.rs:896:14:896:31 | ...::_print(...) |
+| test.rs:899:14:899:31 | ...::_print(...) |
+| test.rs:902:14:902:31 | ...::_print(...) |
+| test.rs:905:14:905:30 | ...::_print(...) |
+| test.rs:907:27:907:36 | ...::_print(...) |
+| test.rs:908:28:908:41 | ...::_print(...) |
+| test.rs:911:14:911:33 | ...::_print(...) |
+| test.rs:913:27:913:36 | ...::_print(...) |
+| test.rs:914:28:914:41 | ...::_print(...) |
+| test.rs:917:14:917:31 | ...::_print(...) |
+| test.rs:919:27:919:36 | ...::_print(...) |
+| test.rs:920:28:920:41 | ...::_print(...) |
+| test.rs:923:14:923:34 | ...::_print(...) |
+| test.rs:925:27:925:36 | ...::_print(...) |
+| test.rs:926:28:926:41 | ...::_print(...) |
+| test.rs:929:14:929:25 | ...::_print(...) |
+| test.rs:931:27:931:36 | ...::_print(...) |
+| test.rs:932:28:932:41 | ...::_print(...) |
+| test.rs:935:14:935:31 | ...::_print(...) |
+| test.rs:937:27:937:36 | ...::_print(...) |
+| test.rs:938:28:938:41 | ...::_print(...) |
+| test.rs:941:14:941:30 | ...::_print(...) |
+| test.rs:943:27:943:36 | ...::_print(...) |
+| test.rs:944:28:944:41 | ...::_print(...) |
+| test.rs:947:14:947:33 | ...::_print(...) |
+| test.rs:949:27:949:36 | ...::_print(...) |
+| test.rs:950:28:950:41 | ...::_print(...) |
+| test.rs:953:14:953:37 | ...::_print(...) |
+| test.rs:955:27:955:36 | ...::_print(...) |
+| test.rs:956:28:956:41 | ...::_print(...) |
+| test.rs:959:14:959:36 | ...::_print(...) |
+| test.rs:961:27:961:36 | ...::_print(...) |
+| test.rs:962:28:962:41 | ...::_print(...) |
+| test.rs:965:14:965:38 | ...::_print(...) |
+| test.rs:967:27:967:36 | ...::_print(...) |
+| test.rs:968:28:968:41 | ...::_print(...) |
+| test.rs:971:14:971:45 | ...::_print(...) |
+| test.rs:973:27:973:36 | ...::_print(...) |
+| test.rs:974:28:974:41 | ...::_print(...) |
+| test.rs:977:14:977:29 | ...::_print(...) |
+| test.rs:979:27:979:36 | ...::_print(...) |
+| test.rs:980:28:980:41 | ...::_print(...) |
 | web_frameworks.rs:13:14:13:22 | a.as_str() |
 | web_frameworks.rs:13:14:13:23 | a.as_str() |
 | web_frameworks.rs:14:14:14:24 | a.as_bytes() |
diff --git a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
index 66d909f2e1ba..59f1e9b4e0c4 100644
--- a/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
+++ b/rust/ql/test/library-tests/dataflow/sources/TaintSources.expected
@@ -55,32 +55,40 @@
 | test.rs:413:31:413:38 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
 | test.rs:418:22:418:39 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:424:22:424:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:425:27:425:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:431:22:431:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:440:31:440:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:445:31:445:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:450:22:450:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:456:26:456:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:457:31:457:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:463:22:463:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:473:20:473:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:507:21:507:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:508:21:508:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:516:21:516:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:528:20:528:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:575:21:575:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:576:21:576:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:584:21:584:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
-| test.rs:601:26:601:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:620:26:620:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:672:28:672:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:754:22:754:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:780:22:780:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
-| test.rs:807:16:807:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
-| test.rs:807:16:807:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:425:22:425:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:439:27:439:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:450:22:450:25 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:451:27:451:35 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:461:22:461:34 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:470:31:470:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:475:31:475:45 | ...::read | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:480:22:480:46 | ...::read_to_string | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:486:26:486:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:486:26:486:29 | path | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:487:31:487:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:487:31:487:39 | file_name | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:493:22:493:41 | ...::read_link | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:503:20:503:38 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:536:50:536:53 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:543:67:543:70 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:550:101:550:104 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:560:21:560:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:561:21:561:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:569:21:569:39 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:581:20:581:40 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:627:52:627:55 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:637:21:637:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:638:21:638:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:646:21:646:41 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:660:20:660:44 | ...::open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:671:56:671:59 | open | Flow source 'FileSource' of type file (DEFAULT). |
+| test.rs:688:26:688:53 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:707:26:707:61 | ...::connect_timeout | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:759:28:759:57 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:841:22:841:49 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:867:22:867:50 | ...::new | Flow source 'RemoteSource' of type remote (DEFAULT). |
+| test.rs:894:16:894:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
+| test.rs:894:16:894:29 | ...::args | Flow source 'CommandLineArgs' of type commandargs (DEFAULT). |
 | test_futures_io.rs:19:15:19:32 | ...::connect | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
 | web_frameworks.rs:11:31:11:31 | a | Flow source 'RemoteSource' of type remote (DEFAULT). |
diff --git a/rust/ql/test/library-tests/dataflow/sources/test.rs b/rust/ql/test/library-tests/dataflow/sources/test.rs
index baa2062a910a..64d74d9527d4 100644
--- a/rust/ql/test/library-tests/dataflow/sources/test.rs
+++ b/rust/ql/test/library-tests/dataflow/sources/test.rs
@@ -421,11 +421,41 @@ fn test_fs() -> Result<(), Box<dyn std::error::Error>> {
 
     for entry in fs::read_dir("directory")? {
         let e = entry?;
+
         let path = e.path(); // $ Alert[rust/summary/taint-sources]
-        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
+        sink(path.clone()); // $ hasTaintFlow
+        sink(path.clone().as_path()); // $ hasTaintFlow
+        sink(path.clone().into_os_string()); // $ MISSING: hasTaintFlow
+        sink(std::path::PathBuf::from(path.clone().into_boxed_path())); // $ MISSING: hasTaintFlow
+        sink(path.clone().as_os_str()); // $ MISSING: hasTaintFlow
+        sink(path.clone().as_mut_os_str()); // $ MISSING: hasTaintFlow
+        sink(path.to_str()); // $ MISSING: hasTaintFlow
+        sink(path.to_path_buf()); // $ MISSING: hasTaintFlow
+        sink(path.file_name().unwrap()); // $ MISSING: hasTaintFlow
+        sink(path.extension().unwrap()); // $ MISSING: hasTaintFlow
+        sink(path.canonicalize().unwrap()); // $ MISSING: hasTaintFlow
         sink(path); // $ hasTaintFlow
+
+        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
+        sink(file_name.clone()); // $ hasTaintFlow
+        sink(file_name.clone().into_string().unwrap()); // $ MISSING: hasTaintFlow
+        sink(file_name.to_str().unwrap()); // $ MISSING: hasTaintFlow
+        sink(file_name.to_string_lossy().to_mut()); // $ MISSING: hasTaintFlow
+        sink(file_name.clone().as_encoded_bytes()); // $ MISSING: hasTaintFlow
         sink(file_name); // $ hasTaintFlow
     }
+    for entry in std::path::Path::new("directory").read_dir()? {
+        let e = entry?;
+
+        let path = e.path(); // $ Alert[rust/summary/taint-sources]
+        let file_name = e.file_name(); // $ Alert[rust/summary/taint-sources]
+    }
+    for entry in std::path::PathBuf::from("directory").read_dir()? {
+        let e = entry?;
+
+        let path = e.path(); // $ MISSING: Alert[rust/summary/taint-sources]
+        let file_name = e.file_name(); // $ MISSING: Alert[rust/summary/taint-sources]
+    }
 
     {
         let target = fs::read_link("symlink.txt")?; // $ Alert[rust/summary/taint-sources]
@@ -500,6 +530,29 @@ fn test_io_file() -> std::io::Result<()> {
         sink(byte); // $ hasTaintFlow="file.txt"
     }
 
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = std::fs::OpenOptions::new().open("f1.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f1.txt"
+    }
+
+    {
+        let mut f2 = std::fs::OpenOptions::new().create_new(true).open("f2.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f2.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f2.txt"
+    }
+
+    {
+        let mut f3 = std::fs::OpenOptions::new().read(true).write(true).truncate(true).create(true).open("f3.txt").unwrap(); // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f3.read(&mut buffer)?;
+        sink(&buffer); // $ hasTaintFlow="f3.txt"
+    }
+
     // --- misc operations ---
 
     {
@@ -568,6 +621,15 @@ async fn test_tokio_file() -> std::io::Result<()> {
         sink(&buffer); // $ MISSING: hasTaintFlow="file.txt" -- we cannot resolve the `read_buf` call above, which comes from `impl<R: AsyncRead + ?Sized> AsyncReadExt for R {}` in `async_read_ext.rs`
     }
 
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = tokio::fs::OpenOptions::new().open("f1.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer).await?;
+        sink(&buffer); // $ MISSING: hasTaintFlow="f1.txt"
+    }
+
     // --- misc operations ---
 
     {
@@ -590,6 +652,31 @@ async fn test_tokio_file() -> std::io::Result<()> {
     Ok(())
 }
 
+use async_std::io::ReadExt;
+
+async fn test_async_std_file() -> std::io::Result<()> {
+    // --- file ---
+
+    let mut file = async_std::fs::File::open("file.txt").await?; // $ Alert[rust/summary/taint-sources]
+
+    {
+        let mut buffer = [0u8; 100];
+        let _bytes = file.read(&mut buffer).await?;
+        sink(&buffer); // $ MISSING: hasTaintFlow="file.txt"
+    }
+
+    // --- OpenOptions ---
+
+    {
+        let mut f1 = async_std::fs::OpenOptions::new().open("f1.txt").await?; // $ Alert[rust/summary/taint-sources]
+        let mut buffer = [0u8; 1024];
+        let _bytes = f1.read(&mut buffer).await?;
+        sink(&buffer); // $ MISSING: hasTaintFlow="f1.txt"
+    }
+
+    Ok(())
+}
+
 use std::net::ToSocketAddrs;
 
 async fn test_std_tcpstream(case: i64) -> std::io::Result<()> {
@@ -863,6 +950,12 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         Err(e) => println!("error: {}", e),
     }
 
+    println!("test_async_std_file...");
+    match futures::executor::block_on(test_async_std_file()) {
+        Ok(_) => println!("complete"),
+        Err(e) => println!("error: {}", e),
+    }
+
     println!("test_std_tcpstream...");
     match futures::executor::block_on(test_std_tcpstream(case)) {
         Ok(_) => println!("complete"),
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 a58a013816d5..be270de025fe 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,10 +1,11 @@
 models
-| 1 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0]; ReturnValue; value |
-| 2 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
-| 3 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
-| 4 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
-| 5 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
-| 6 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
+| 1 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0].Reference; ReturnValue; value |
+| 2 | Summary: <alloc::string::String as core::convert::From>::from; Argument[0]; ReturnValue; value |
+| 3 | Summary: <alloc::string::String as core::ops::arith::Add>::add; Argument[self]; ReturnValue; value |
+| 4 | Summary: <alloc::string::String>::as_str; Argument[self]; ReturnValue; value |
+| 5 | Summary: <core::str>::as_str; Argument[self]; ReturnValue; value |
+| 6 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
+| 7 | Summary: core::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 |  |
@@ -15,46 +16,47 @@ edges
 | main.rs:32:9:32:10 | s1 | main.rs:35:14:35:15 | s1 | 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:35:14:35:15 | s1 | main.rs:35:14:35:20 | ... + ... | provenance | MaD:2 |
+| main.rs:35:14:35:15 | s1 | main.rs:35:14:35:20 | ... + ... | provenance | MaD:3 |
 | main.rs:35:14:35:20 | ... + ... | main.rs:35:9:35:10 | 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:52:27:52:28 | s1 | main.rs:52:14:52:29 | ...::from(...) | provenance | MaD:2 |
 | main.rs:63:9:63:9 | s | main.rs:64:16:64:16 | s | provenance |  |
-| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:3 |
 | main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
+| main.rs:63:9:63:9 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:5 |
 | 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:3 |
 | main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:4 |
+| main.rs:64:16:64:16 | s | main.rs:64:16:64:25 | s.as_str() | provenance | MaD:5 |
 | 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:5 |
+| main.rs:70:34:70:61 | MacroExpr | main.rs:70:22:70:62 | ...::format(...) | provenance | MaD:6 |
 | 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:5 |
+| main.rs:73:34:73:59 | MacroExpr | main.rs:73:22:73:60 | ...::format(...) | provenance | MaD:6 |
 | 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:5 |
+| main.rs:77:34:77:74 | MacroExpr | main.rs:77:22:77:75 | ...::format(...) | provenance | MaD:6 |
 | 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:10:86:16 | res | main.rs:86:18:86:25 | { ... } | provenance |  |
+| main.rs:86:18:86:25 | ...::format(...) | main.rs:86:10:86:16 | 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:5 |
-| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:6 |
-| 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:86:18:86:25 | MacroExpr | main.rs:86:18:86:25 | ...::format(...) | provenance | MaD:6 |
+| main.rs:86:18:86:25 | { ... } | main.rs:86:18:86:25 | ...::must_use(...) | provenance | MaD:7 |
+| main.rs:87:10:87:16 | res | main.rs:87:18:87:32 | { ... } | provenance |  |
+| main.rs:87:18:87:32 | ...::format(...) | main.rs:87:10:87:16 | 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:5 |
-| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:6 |
+| main.rs:87:18:87:32 | MacroExpr | main.rs:87:18:87:32 | ...::format(...) | provenance | MaD:6 |
+| main.rs:87:18:87:32 | { ... } | main.rs:87:18:87:32 | ...::must_use(...) | provenance | MaD:7 |
 nodes
 | main.rs:26:9:26:9 | s | semmle.label | s |
 | main.rs:26:13:26:22 | source(...) | semmle.label | source(...) |
@@ -96,14 +98,14 @@ nodes
 | main.rs:78:10:78:19 | formatted3 | semmle.label | formatted3 |
 | main.rs:82:9:82:10 | s1 | semmle.label | s1 |
 | main.rs:82:14:82:23 | source(...) | semmle.label | source(...) |
+| main.rs:86:10:86:16 | res | semmle.label | res |
 | main.rs:86:10:86:26 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:86:10:86:26 | res | semmle.label | res |
 | main.rs:86:18:86:25 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:86:18:86:25 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:86:18:86:25 | MacroExpr | semmle.label | MacroExpr |
 | main.rs:86:18:86:25 | { ... } | semmle.label | { ... } |
+| main.rs:87:10:87:16 | res | semmle.label | res |
 | main.rs:87:10:87:33 | MacroExpr | semmle.label | MacroExpr |
-| main.rs:87:10:87:33 | res | semmle.label | res |
 | main.rs:87:18:87:32 | ...::format(...) | semmle.label | ...::format(...) |
 | main.rs:87:18:87:32 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | main.rs:87:18:87:32 | MacroExpr | semmle.label | MacroExpr |
diff --git a/rust/ql/test/library-tests/definitions/Definitions.expected b/rust/ql/test/library-tests/definitions/Definitions.expected
index f3cde8950682..b6f8201240ac 100644
--- a/rust/ql/test/library-tests/definitions/Definitions.expected
+++ b/rust/ql/test/library-tests/definitions/Definitions.expected
@@ -2,28 +2,39 @@
 | main.rs:9:14:9:14 | S | main.rs:7:9:7:21 | struct S | path |
 | main.rs:10:36:10:39 | Self | main.rs:7:9:7:21 | struct S | path |
 | main.rs:11:17:11:17 | S | main.rs:7:9:7:21 | struct S | path |
-| main.rs:21:22:21:26 | value | main.rs:21:50:21:54 | value | format argument |
-| main.rs:21:29:21:33 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:21:36:21:44 | precision | main.rs:19:9:19:17 | precision | local variable |
-| main.rs:22:22:22:22 | 0 | main.rs:22:34:22:38 | value | format argument |
-| main.rs:22:25:22:25 | 1 | main.rs:22:41:22:45 | width | format argument |
-| main.rs:22:28:22:28 | 2 | main.rs:22:48:22:56 | precision | format argument |
-| main.rs:22:34:22:38 | value | main.rs:20:9:20:13 | value | local variable |
-| main.rs:22:41:22:45 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:22:48:22:56 | precision | main.rs:19:9:19:17 | precision | local variable |
-| main.rs:23:21:23:22 | {} | main.rs:23:29:23:33 | value | format argument |
-| main.rs:23:24:23:25 | {} | main.rs:23:36:23:40 | width | format argument |
-| main.rs:23:29:23:33 | value | main.rs:20:9:20:13 | value | local variable |
-| main.rs:23:36:23:40 | width | main.rs:18:9:18:13 | width | local variable |
-| main.rs:25:22:25:27 | people | main.rs:24:9:24:14 | people | local variable |
-| main.rs:26:16:26:16 | 1 | main.rs:26:34:26:34 | 2 | format argument |
-| main.rs:26:19:26:20 | {} | main.rs:26:31:26:31 | 1 | format argument |
-| main.rs:26:23:26:23 | 0 | main.rs:26:31:26:31 | 1 | format argument |
-| main.rs:26:26:26:27 | {} | main.rs:26:34:26:34 | 2 | format argument |
-| main.rs:27:31:27:35 | {:<5} | main.rs:27:40:27:42 | "x" | format argument |
-| main.rs:28:13:28:13 | S | main.rs:1:1:1:9 | struct S | path |
-| main.rs:29:13:29:14 | M1 | main.rs:5:1:15:1 | mod M1 | path |
-| main.rs:29:17:29:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
-| main.rs:29:21:29:21 | S | main.rs:7:9:7:21 | struct S | path |
-| main.rs:30:5:30:5 | s | main.rs:29:9:29:9 | s | local variable |
-| main.rs:30:7:30:12 | method | main.rs:10:13:12:13 | fn method | method |
+| main.rs:16:22:16:22 | T | main.rs:16:19:16:19 | T | path |
+| main.rs:18:13:18:14 | S2 | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:18:16:18:16 | T | main.rs:18:10:18:10 | T | path |
+| main.rs:19:23:19:23 | T | main.rs:18:10:18:10 | T | path |
+| main.rs:19:29:19:32 | Self | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:20:16:20:16 | x | main.rs:19:20:19:20 | x | local variable |
+| main.rs:29:22:29:26 | value | main.rs:29:50:29:54 | value | format argument |
+| main.rs:29:29:29:33 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:29:36:29:44 | precision | main.rs:27:9:27:17 | precision | local variable |
+| main.rs:30:22:30:22 | 0 | main.rs:30:34:30:38 | value | format argument |
+| main.rs:30:25:30:25 | 1 | main.rs:30:41:30:45 | width | format argument |
+| main.rs:30:28:30:28 | 2 | main.rs:30:48:30:56 | precision | format argument |
+| main.rs:30:34:30:38 | value | main.rs:28:9:28:13 | value | local variable |
+| main.rs:30:41:30:45 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:30:48:30:56 | precision | main.rs:27:9:27:17 | precision | local variable |
+| main.rs:31:21:31:22 | {} | main.rs:31:29:31:33 | value | format argument |
+| main.rs:31:24:31:25 | {} | main.rs:31:36:31:40 | width | format argument |
+| main.rs:31:29:31:33 | value | main.rs:28:9:28:13 | value | local variable |
+| main.rs:31:36:31:40 | width | main.rs:26:9:26:13 | width | local variable |
+| main.rs:33:22:33:27 | people | main.rs:32:9:32:14 | people | local variable |
+| main.rs:34:16:34:16 | 1 | main.rs:34:34:34:34 | 2 | format argument |
+| main.rs:34:19:34:20 | {} | main.rs:34:31:34:31 | 1 | format argument |
+| main.rs:34:23:34:23 | 0 | main.rs:34:31:34:31 | 1 | format argument |
+| main.rs:34:26:34:27 | {} | main.rs:34:34:34:34 | 2 | format argument |
+| main.rs:35:31:35:35 | {:<5} | main.rs:35:40:35:42 | "x" | format argument |
+| main.rs:36:13:36:13 | S | main.rs:1:1:1:9 | struct S | path |
+| main.rs:37:13:37:14 | M1 | main.rs:5:1:23:1 | mod M1 | path |
+| main.rs:37:17:37:18 | M2 | main.rs:6:5:14:5 | mod M2 | path |
+| main.rs:37:21:37:21 | S | main.rs:7:9:7:21 | struct S | path |
+| main.rs:38:5:38:5 | s | main.rs:37:9:37:9 | s | local variable |
+| main.rs:38:7:38:12 | method | main.rs:10:13:12:13 | fn method | method |
+| main.rs:39:5:39:6 | M1 | main.rs:5:1:23:1 | mod M1 | path |
+| main.rs:39:9:39:10 | S2 | main.rs:16:5:16:24 | struct S2 | path |
+| main.rs:39:14:39:14 | S | main.rs:1:1:1:9 | struct S | path |
+| main.rs:39:18:39:20 | new | main.rs:19:9:21:9 | fn new | path |
+| main.rs:39:22:39:22 | S | main.rs:1:1:1:9 | struct S | path |
diff --git a/rust/ql/test/library-tests/definitions/main.rs b/rust/ql/test/library-tests/definitions/main.rs
index 35acea6858e6..89742adf8f91 100644
--- a/rust/ql/test/library-tests/definitions/main.rs
+++ b/rust/ql/test/library-tests/definitions/main.rs
@@ -12,6 +12,14 @@ mod M1 {
             }
         }
     }
+
+    pub struct S2<T>(T);
+
+    impl<T> S2<T> {
+        pub fn new(x: T) -> Self {
+            S2(x)
+        }
+    }
 }
 
 fn main() {
@@ -28,4 +36,5 @@ fn main() {
     let x = S;
     let s = M1::M2::S;
     s.method();
+    M1::S2::<S>::new(S);
 }
diff --git a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
index 0e649697a604..9d1761069feb 100644
--- a/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/path-resolution/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,7 +1,3 @@
 multipleCallTargets
 | main.rs:118:9:118:11 | f(...) |
-| proc_macro.rs:9:5:11:5 | ...::new(...) |
-multiplePathResolutions
-| main.rs:641:3:641:12 | proc_macro |
-| main.rs:647:7:647:16 | proc_macro |
-| main.rs:650:7:650:16 | proc_macro |
+| proc_macro.rs:9:5:9:10 | ...::new(...) |
diff --git a/rust/ql/test/library-tests/path-resolution/main.rs b/rust/ql/test/library-tests/path-resolution/main.rs
index f58d82826d64..1de91a60fe44 100644
--- a/rust/ql/test/library-tests/path-resolution/main.rs
+++ b/rust/ql/test/library-tests/path-resolution/main.rs
@@ -460,6 +460,58 @@ mod m16 {
     } // I83
 }
 
+mod trait_visibility {
+    mod m {
+        pub trait Foo {
+            fn a_method(&self); // Foo::a_method
+        } // Foo
+
+        pub trait Bar {
+            fn a_method(&self); // Bar::a_method
+        } // Bar
+
+        pub struct X;
+        #[rustfmt::skip]
+        impl Foo for X { // $ item=Foo item=X
+            fn a_method(&self) {
+                println!("foo!");
+            } // X_Foo::a_method
+        }
+        #[rustfmt::skip]
+        impl Bar for X { // $ item=Bar item=X
+            fn a_method(&self) {
+                println!("bar!");
+            } // X_Bar::a_method
+        }
+    }
+
+    use m::X; // $ item=X
+
+    pub fn f() {
+        let x = X; // $ item=X
+        {
+            // Only the `Foo` trait is visible
+            use m::Foo; // $ item=Foo
+            X::a_method(&x); // $ item=X_Foo::a_method
+        }
+        {
+            // Only the `Bar` trait is visible
+            use m::Bar; // $ item=Bar
+            X::a_method(&x); // $ item=X_Bar::a_method
+        }
+        {
+            // Only the `Bar` trait is visible (but unnameable)
+            use m::Bar as _; // $ item=Bar
+            X::a_method(&x); // $ item=X_Bar::a_method
+        }
+        {
+            // The `Bar` trait is not visible, but we can refer to its method
+            // with a full path.
+            m::Bar::a_method(&x); // $ item=Bar::a_method
+        }
+    } // trait_visibility::f
+}
+
 mod m17 {
     trait MyTrait {
         fn f(&self); // I1
@@ -730,6 +782,7 @@ fn main() {
     m11::f(); // $ item=I63
     m15::f(); // $ item=I75
     m16::f(); // $ item=I83
+    trait_visibility::f(); // $ item=trait_visibility::f
     m17::f(); // $ item=I99
     nested6::f(); // $ item=I116
     nested8::f(); // $ item=I119
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 0eb100542b57..a51816a52282 100644
--- a/rust/ql/test/library-tests/path-resolution/path-resolution.expected
+++ b/rust/ql/test/library-tests/path-resolution/path-resolution.expected
@@ -19,16 +19,18 @@ mod
 | main.rs:287:5:295:5 | mod m14 |
 | main.rs:298:1:367:1 | mod m15 |
 | main.rs:369:1:461:1 | mod m16 |
-| main.rs:463:1:493:1 | mod m17 |
-| main.rs:495:1:513:1 | mod m18 |
-| main.rs:500:5:512:5 | mod m19 |
-| main.rs:505:9:511:9 | mod m20 |
-| main.rs:515:1:540:1 | mod m21 |
-| main.rs:516:5:522:5 | mod m22 |
-| main.rs:524:5:539:5 | mod m33 |
-| main.rs:542:1:567:1 | mod m23 |
-| main.rs:569:1:637:1 | mod m24 |
-| main.rs:654:1:706:1 | mod associated_types |
+| main.rs:463:1:513:1 | mod trait_visibility |
+| main.rs:464:5:486:5 | mod m |
+| main.rs:515:1:545:1 | mod m17 |
+| main.rs:547:1:565:1 | mod m18 |
+| main.rs:552:5:564:5 | mod m19 |
+| main.rs:557:9:563:9 | mod m20 |
+| main.rs:567:1:592:1 | mod m21 |
+| main.rs:568:5:574:5 | mod m22 |
+| main.rs:576:5:591:5 | mod m33 |
+| main.rs:594:1:619:1 | mod m23 |
+| main.rs:621:1:689:1 | mod m24 |
+| main.rs:706:1:758:1 | mod associated_types |
 | my2/mod.rs:1:1:1:16 | mod nested2 |
 | my2/mod.rs:12:1:12:12 | mod my3 |
 | my2/mod.rs:14:1:15:10 | mod mymod |
@@ -62,7 +64,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:746:2 | SourceFile |
+| main.rs:40:9:40:13 | super | main.rs:1:1:799: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 |
@@ -74,7 +76,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:746:2 | SourceFile |
+| main.rs:68:5:68:8 | self | main.rs:1:1:799: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:78:16:78:18 | i32 | {EXTERNAL LOCATION} | struct i32 |
@@ -89,7 +91,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:746:2 | SourceFile |
+| main.rs:117:13:117:17 | super | main.rs:1:1:799: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 |
@@ -223,172 +225,193 @@ resolvePath
 | main.rs:455:10:455:10 | S | main.rs:403:5:403:13 | struct S |
 | main.rs:456:14:458:11 | Trait1::<...> | main.rs:370:5:386:5 | trait Trait1 |
 | main.rs:457:13:457:13 | S | main.rs:403:5:403:13 | struct S |
-| main.rs:471:10:471:16 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:472:9:472:9 | S | main.rs:468:5:468:13 | struct S |
-| main.rs:480:7:480:13 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:481:10:481:10 | T | main.rs:479:10:479:10 | T |
-| main.rs:483:9:483:9 | T | main.rs:479:10:479:10 | T |
-| main.rs:483:9:483:12 | ...::f | main.rs:465:9:465:20 | fn f |
-| main.rs:484:9:484:15 | MyTrait | main.rs:464:5:466:5 | trait MyTrait |
-| main.rs:484:9:484:18 | ...::f | main.rs:465:9:465:20 | fn f |
-| main.rs:489:9:489:9 | g | main.rs:478:5:485:5 | fn g |
-| main.rs:490:11:490:11 | S | main.rs:468:5:468:13 | struct S |
-| main.rs:508:17:508:21 | super | main.rs:500:5:512:5 | mod m19 |
-| main.rs:508:17:508:24 | ...::f | main.rs:501:9:503:9 | fn f |
-| main.rs:509:17:509:21 | super | main.rs:500:5:512:5 | mod m19 |
-| main.rs:509:17:509:28 | ...::super | main.rs:495:1:513:1 | mod m18 |
-| main.rs:509:17:509:31 | ...::f | main.rs:496:5:498:5 | fn f |
-| main.rs:526:13:526:17 | super | main.rs:515:1:540:1 | mod m21 |
-| main.rs:526:13:526:22 | ...::m22 | main.rs:516:5:522:5 | mod m22 |
-| main.rs:526:13:526:30 | ...::MyEnum | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:527:13:527:16 | self | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:531:13:531:17 | super | main.rs:515:1:540:1 | mod m21 |
-| main.rs:531:13:531:22 | ...::m22 | main.rs:516:5:522:5 | mod m22 |
-| main.rs:531:13:531:32 | ...::MyStruct | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:532:13:532:16 | self | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:536:21:536:26 | MyEnum | main.rs:517:9:519:9 | enum MyEnum |
-| main.rs:536:21:536:29 | ...::A | main.rs:518:13:518:13 | A |
-| main.rs:537:21:537:28 | MyStruct | main.rs:521:9:521:28 | struct MyStruct |
-| main.rs:553:10:555:5 | Trait1::<...> | main.rs:543:5:548:5 | trait Trait1 |
-| main.rs:554:7:554:10 | Self | main.rs:550:5:550:13 | struct S |
-| main.rs:556:11:556:11 | S | main.rs:550:5:550:13 | struct S |
-| main.rs:564:17:564:17 | S | main.rs:550:5:550:13 | struct S |
-| main.rs:580:15:580:15 | T | main.rs:579:26:579:26 | T |
-| main.rs:585:9:585:24 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:585:23:585:23 | T | main.rs:584:10:584:10 | T |
-| main.rs:587:9:587:9 | T | main.rs:584:10:584:10 | T |
-| main.rs:587:12:587:17 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:596:9:596:24 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:596:23:596:23 | T | main.rs:595:10:595:10 | T |
-| main.rs:598:9:598:9 | T | main.rs:595:10:595:10 | T |
-| main.rs:598:12:598:17 | TraitB | main.rs:574:5:576:5 | trait TraitB |
-| main.rs:599:9:599:9 | T | main.rs:595:10:595:10 | T |
-| main.rs:599:12:599:17 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:610:10:610:15 | TraitA | main.rs:570:5:572:5 | trait TraitA |
-| main.rs:610:21:610:31 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:617:10:617:15 | TraitB | main.rs:574:5:576:5 | trait TraitB |
-| main.rs:617:21:617:31 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:625:24:625:34 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:626:23:626:35 | GenericStruct | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:632:9:632:36 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:632:9:632:50 | ...::call_trait_a | main.rs:589:9:591:9 | fn call_trait_a |
-| main.rs:632:25:632:35 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:635:9:635:36 | GenericStruct::<...> | main.rs:578:5:581:5 | struct GenericStruct |
-| main.rs:635:9:635:47 | ...::call_both | main.rs:601:9:604:9 | fn call_both |
-| main.rs:635:25:635:35 | Implementor | main.rs:607:5:607:23 | struct Implementor |
-| main.rs:641:3:641:12 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:641:3:641:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:641:3:641:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:645:6:645:12 | AStruct | main.rs:644:1:644:17 | struct AStruct |
-| main.rs:647:7:647:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:647:7:647:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:647:7:647:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:650:7:650:16 | proc_macro | {EXTERNAL LOCATION} | Crate(proc_macro@0.0.0) |
-| main.rs:650:7:650:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
-| main.rs:650:7:650:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
-| main.rs:655:9:655:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:655:9:655:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
-| main.rs:655:9:655:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:656:9:656:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:656:9:656:19 | ...::result | {EXTERNAL LOCATION} | mod result |
-| main.rs:656:9:656:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
-| main.rs:664:19:664:22 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:664:19:664:29 | ...::Input | main.rs:659:9:659:19 | type Input |
-| main.rs:665:14:665:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:665:21:665:24 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:665:21:665:32 | ...::Output | main.rs:660:21:661:20 | type Output |
-| main.rs:665:35:665:38 | Self | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:665:35:665:45 | ...::Error | main.rs:659:21:660:19 | type Error |
-| main.rs:669:17:669:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:669:29:669:33 | Input | main.rs:668:19:668:23 | Input |
-| main.rs:670:17:670:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
-| main.rs:670:29:670:33 | Error | main.rs:668:26:668:30 | Error |
-| main.rs:677:11:677:16 | Reduce | main.rs:658:5:666:5 | trait Reduce |
-| main.rs:678:13:681:9 | MyImpl::<...> | main.rs:668:5:671:5 | struct MyImpl |
-| main.rs:679:13:679:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:680:13:680:17 | Error | main.rs:676:13:676:17 | Error |
-| main.rs:683:22:686:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:684:13:684:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:685:13:685:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:685:13:685:23 | ...::Error | main.rs:687:11:691:9 | type Error |
-| main.rs:688:22:690:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
-| main.rs:689:11:689:15 | Error | main.rs:676:13:676:17 | Error |
-| main.rs:693:13:693:17 | Input | main.rs:675:13:675:17 | Input |
-| main.rs:698:19:698:22 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:698:19:698:29 | ...::Input | main.rs:683:9:687:9 | type Input |
-| main.rs:699:14:702:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
-| main.rs:700:13:700:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:700:13:700:24 | ...::Output | main.rs:691:11:694:9 | type Output |
-| main.rs:701:13:701:16 | Self | main.rs:673:5:705:5 | impl Reduce for MyImpl::<...> { ... } |
-| main.rs:701:13:701:23 | ...::Error | main.rs:687:11:691:9 | type Error |
-| main.rs:708:5:708:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:708:11:708:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:710:15:710:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
-| main.rs:710:15:710:25 | ...::string | {EXTERNAL LOCATION} | mod string |
-| main.rs:710:15:710:33 | ...::String | {EXTERNAL LOCATION} | struct String |
-| main.rs:713:5:713:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:713:5:713:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
-| main.rs:713:5:713:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
-| main.rs:713:5:713:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
-| main.rs:713:5:713:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
-| main.rs:714:5:714:6 | my | main.rs:1:1:1:7 | mod my |
-| main.rs:714:5:714:9 | ...::f | my.rs:5:1:7:1 | fn f |
-| main.rs:715:5:715:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
-| main.rs:715:5:715:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
-| main.rs:715:5:715:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
-| main.rs:715:5:715:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:716:5:716:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:717:5:717:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:718:5:718:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:718:5:718:12 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:719:5:719:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:719:5:719:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:719:5:719:13 | ...::g | main.rs:23:9:27:9 | fn g |
-| main.rs:720:5:720:6 | m1 | main.rs:13:1:37:1 | mod m1 |
-| main.rs:720:5:720:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
-| main.rs:720:5:720:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
-| main.rs:720:5:720:17 | ...::h | main.rs:30:27:34:13 | fn h |
-| main.rs:721:5:721:6 | m4 | main.rs:39:1:46:1 | mod m4 |
-| main.rs:721:5:721:9 | ...::i | main.rs:42:5:45:5 | fn i |
-| main.rs:722:5:722:5 | h | main.rs:50:1:69:1 | fn h |
-| main.rs:723:5:723:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
-| main.rs:724:5:724:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
-| main.rs:725:5:725:5 | j | main.rs:97:1:101:1 | fn j |
-| main.rs:726:5:726:6 | m6 | main.rs:109:1:120:1 | mod m6 |
-| main.rs:726:5:726:9 | ...::g | main.rs:114:5:119:5 | fn g |
-| main.rs:727:5:727:6 | m7 | main.rs:122:1:141:1 | mod m7 |
-| main.rs:727:5:727:9 | ...::f | main.rs:133:5:140:5 | fn f |
-| main.rs:728:5:728:6 | m8 | main.rs:143:1:197:1 | mod m8 |
-| main.rs:728:5:728:9 | ...::g | main.rs:181:5:196:5 | fn g |
-| main.rs:729:5:729:6 | m9 | main.rs:199:1:207:1 | mod m9 |
-| main.rs:729:5:729:9 | ...::f | main.rs:202:5:206:5 | fn f |
-| main.rs:730:5:730:7 | m11 | main.rs:230:1:267:1 | mod m11 |
-| main.rs:730:5:730:10 | ...::f | main.rs:235:5:238:5 | fn f |
-| main.rs:731:5:731:7 | m15 | main.rs:298:1:367:1 | mod m15 |
-| main.rs:731:5:731:10 | ...::f | main.rs:354:5:366:5 | fn f |
-| main.rs:732:5:732:7 | m16 | main.rs:369:1:461:1 | mod m16 |
-| main.rs:732:5:732:10 | ...::f | main.rs:436:5:460:5 | fn f |
-| main.rs:733:5:733:7 | m17 | main.rs:463:1:493:1 | mod m17 |
-| main.rs:733:5:733:10 | ...::f | main.rs:487:5:492:5 | fn f |
-| main.rs:734:5:734:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
-| main.rs:734:5:734:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
-| main.rs:735:5:735:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
-| main.rs:735:5:735:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
-| main.rs:736:5:736:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
-| main.rs:736:5:736:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
-| main.rs:737:5:737:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
-| main.rs:738:5:738:7 | m18 | main.rs:495:1:513:1 | mod m18 |
-| main.rs:738:5:738:12 | ...::m19 | main.rs:500:5:512:5 | mod m19 |
-| main.rs:738:5:738:17 | ...::m20 | main.rs:505:9:511:9 | mod m20 |
-| main.rs:738:5:738:20 | ...::g | main.rs:506:13:510:13 | fn g |
-| main.rs:739:5:739:7 | m23 | main.rs:542:1:567:1 | mod m23 |
-| main.rs:739:5:739:10 | ...::f | main.rs:562:5:566:5 | fn f |
-| main.rs:740:5:740:7 | m24 | main.rs:569:1:637:1 | mod m24 |
-| main.rs:740:5:740:10 | ...::f | main.rs:623:5:636:5 | fn f |
-| main.rs:741:5:741:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
-| main.rs:741:5:741:11 | ...::h | main.rs:50:1:69:1 | fn h |
-| main.rs:743:5:743:11 | AStruct | main.rs:644:1:644:17 | struct AStruct |
-| main.rs:744:5:744:11 | AStruct | main.rs:644:1:644:17 | struct AStruct |
+| main.rs:475:14:475:16 | Foo | main.rs:465:9:467:9 | trait Foo |
+| main.rs:475:22:475:22 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:481:14:481:16 | Bar | main.rs:469:9:471:9 | trait Bar |
+| main.rs:481:22:481:22 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:488:9:488:9 | m | main.rs:464:5:486:5 | mod m |
+| main.rs:488:9:488:12 | ...::X | main.rs:473:9:473:21 | struct X |
+| main.rs:491:17:491:17 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:494:17:494:17 | m | main.rs:464:5:486:5 | mod m |
+| main.rs:494:17:494:22 | ...::Foo | main.rs:465:9:467:9 | trait Foo |
+| main.rs:495:13:495:13 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:495:13:495:23 | ...::a_method | main.rs:475:26:478:13 | fn a_method |
+| main.rs:499:17:499:17 | m | main.rs:464:5:486:5 | mod m |
+| main.rs:499:17:499:22 | ...::Bar | main.rs:469:9:471:9 | trait Bar |
+| main.rs:500:13:500:13 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:500:13:500:23 | ...::a_method | main.rs:481:26:484:13 | fn a_method |
+| main.rs:504:17:504:17 | m | main.rs:464:5:486:5 | mod m |
+| main.rs:504:17:504:22 | ...::Bar | main.rs:469:9:471:9 | trait Bar |
+| main.rs:505:13:505:13 | X | main.rs:473:9:473:21 | struct X |
+| main.rs:505:13:505:23 | ...::a_method | main.rs:481:26:484:13 | fn a_method |
+| main.rs:510:13:510:13 | m | main.rs:464:5:486:5 | mod m |
+| main.rs:510:13:510:18 | ...::Bar | main.rs:469:9:471:9 | trait Bar |
+| main.rs:510:13:510:28 | ...::a_method | main.rs:470:13:470:31 | fn a_method |
+| main.rs:523:10:523:16 | MyTrait | main.rs:516:5:518:5 | trait MyTrait |
+| main.rs:524:9:524:9 | S | main.rs:520:5:520:13 | struct S |
+| main.rs:532:7:532:13 | MyTrait | main.rs:516:5:518:5 | trait MyTrait |
+| main.rs:533:10:533:10 | T | main.rs:531:10:531:10 | T |
+| main.rs:535:9:535:9 | T | main.rs:531:10:531:10 | T |
+| main.rs:535:9:535:12 | ...::f | main.rs:517:9:517:20 | fn f |
+| main.rs:536:9:536:15 | MyTrait | main.rs:516:5:518:5 | trait MyTrait |
+| main.rs:536:9:536:18 | ...::f | main.rs:517:9:517:20 | fn f |
+| main.rs:541:9:541:9 | g | main.rs:530:5:537:5 | fn g |
+| main.rs:542:11:542:11 | S | main.rs:520:5:520:13 | struct S |
+| main.rs:560:17:560:21 | super | main.rs:552:5:564:5 | mod m19 |
+| main.rs:560:17:560:24 | ...::f | main.rs:553:9:555:9 | fn f |
+| main.rs:561:17:561:21 | super | main.rs:552:5:564:5 | mod m19 |
+| main.rs:561:17:561:28 | ...::super | main.rs:547:1:565:1 | mod m18 |
+| main.rs:561:17:561:31 | ...::f | main.rs:548:5:550:5 | fn f |
+| main.rs:578:13:578:17 | super | main.rs:567:1:592:1 | mod m21 |
+| main.rs:578:13:578:22 | ...::m22 | main.rs:568:5:574:5 | mod m22 |
+| main.rs:578:13:578:30 | ...::MyEnum | main.rs:569:9:571:9 | enum MyEnum |
+| main.rs:579:13:579:16 | self | main.rs:569:9:571:9 | enum MyEnum |
+| main.rs:583:13:583:17 | super | main.rs:567:1:592:1 | mod m21 |
+| main.rs:583:13:583:22 | ...::m22 | main.rs:568:5:574:5 | mod m22 |
+| main.rs:583:13:583:32 | ...::MyStruct | main.rs:573:9:573:28 | struct MyStruct |
+| main.rs:584:13:584:16 | self | main.rs:573:9:573:28 | struct MyStruct |
+| main.rs:588:21:588:26 | MyEnum | main.rs:569:9:571:9 | enum MyEnum |
+| main.rs:588:21:588:29 | ...::A | main.rs:570:13:570:13 | A |
+| main.rs:589:21:589:28 | MyStruct | main.rs:573:9:573:28 | struct MyStruct |
+| main.rs:605:10:607:5 | Trait1::<...> | main.rs:595:5:600:5 | trait Trait1 |
+| main.rs:606:7:606:10 | Self | main.rs:602:5:602:13 | struct S |
+| main.rs:608:11:608:11 | S | main.rs:602:5:602:13 | struct S |
+| main.rs:616:17:616:17 | S | main.rs:602:5:602:13 | struct S |
+| main.rs:632:15:632:15 | T | main.rs:631:26:631:26 | T |
+| main.rs:637:9:637:24 | GenericStruct::<...> | main.rs:630:5:633:5 | struct GenericStruct |
+| main.rs:637:23:637:23 | T | main.rs:636:10:636:10 | T |
+| main.rs:639:9:639:9 | T | main.rs:636:10:636:10 | T |
+| main.rs:639:12:639:17 | TraitA | main.rs:622:5:624:5 | trait TraitA |
+| main.rs:648:9:648:24 | GenericStruct::<...> | main.rs:630:5:633:5 | struct GenericStruct |
+| main.rs:648:23:648:23 | T | main.rs:647:10:647:10 | T |
+| main.rs:650:9:650:9 | T | main.rs:647:10:647:10 | T |
+| main.rs:650:12:650:17 | TraitB | main.rs:626:5:628:5 | trait TraitB |
+| main.rs:651:9:651:9 | T | main.rs:647:10:647:10 | T |
+| main.rs:651:12:651:17 | TraitA | main.rs:622:5:624:5 | trait TraitA |
+| main.rs:662:10:662:15 | TraitA | main.rs:622:5:624:5 | trait TraitA |
+| main.rs:662:21:662:31 | Implementor | main.rs:659:5:659:23 | struct Implementor |
+| main.rs:669:10:669:15 | TraitB | main.rs:626:5:628:5 | trait TraitB |
+| main.rs:669:21:669:31 | Implementor | main.rs:659:5:659:23 | struct Implementor |
+| main.rs:677:24:677:34 | Implementor | main.rs:659:5:659:23 | struct Implementor |
+| main.rs:678:23:678:35 | GenericStruct | main.rs:630:5:633:5 | struct GenericStruct |
+| main.rs:684:9:684:36 | GenericStruct::<...> | main.rs:630:5:633:5 | struct GenericStruct |
+| main.rs:684:9:684:50 | ...::call_trait_a | main.rs:641:9:643:9 | fn call_trait_a |
+| main.rs:684:25:684:35 | Implementor | main.rs:659:5:659:23 | struct Implementor |
+| main.rs:687:9:687:36 | GenericStruct::<...> | main.rs:630:5:633:5 | struct GenericStruct |
+| main.rs:687:9:687:47 | ...::call_both | main.rs:653:9:656:9 | fn call_both |
+| main.rs:687:25:687:35 | Implementor | main.rs:659:5:659:23 | struct Implementor |
+| main.rs:693:3:693:12 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:693:3:693:24 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:697:6:697:12 | AStruct | main.rs:696:1:696:17 | struct AStruct |
+| main.rs:699:7:699:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:699:7:699:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:702:7:702:16 | proc_macro | proc_macro.rs:0:0:0:0 | Crate(proc_macro@0.0.1) |
+| main.rs:702:7:702:28 | ...::add_suffix | proc_macro.rs:4:1:12:1 | fn add_suffix |
+| main.rs:707:9:707:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:707:9:707:19 | ...::marker | {EXTERNAL LOCATION} | mod marker |
+| main.rs:707:9:707:32 | ...::PhantomData | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:708:9:708:11 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:708:9:708:19 | ...::result | {EXTERNAL LOCATION} | mod result |
+| main.rs:708:9:708:27 | ...::Result | {EXTERNAL LOCATION} | enum Result |
+| main.rs:716:19:716:22 | Self | main.rs:710:5:718:5 | trait Reduce |
+| main.rs:716:19:716:29 | ...::Input | main.rs:711:9:711:19 | type Input |
+| main.rs:717:14:717:46 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:717:21:717:24 | Self | main.rs:710:5:718:5 | trait Reduce |
+| main.rs:717:21:717:32 | ...::Output | main.rs:712:21:713:20 | type Output |
+| main.rs:717:35:717:38 | Self | main.rs:710:5:718:5 | trait Reduce |
+| main.rs:717:35:717:45 | ...::Error | main.rs:711:21:712:19 | type Error |
+| main.rs:721:17:721:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:721:29:721:33 | Input | main.rs:720:19:720:23 | Input |
+| main.rs:722:17:722:34 | PhantomData::<...> | {EXTERNAL LOCATION} | struct PhantomData |
+| main.rs:722:29:722:33 | Error | main.rs:720:26:720:30 | Error |
+| main.rs:729:11:729:16 | Reduce | main.rs:710:5:718:5 | trait Reduce |
+| main.rs:730:13:733:9 | MyImpl::<...> | main.rs:720:5:723:5 | struct MyImpl |
+| main.rs:731:13:731:17 | Input | main.rs:727:13:727:17 | Input |
+| main.rs:732:13:732:17 | Error | main.rs:728:13:728:17 | Error |
+| main.rs:735:22:738:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:736:13:736:17 | Input | main.rs:727:13:727:17 | Input |
+| main.rs:737:13:737:16 | Self | main.rs:725:5:757:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:737:13:737:23 | ...::Error | main.rs:739:11:743:9 | type Error |
+| main.rs:740:22:742:9 | Option::<...> | {EXTERNAL LOCATION} | enum Option |
+| main.rs:741:11:741:15 | Error | main.rs:728:13:728:17 | Error |
+| main.rs:745:13:745:17 | Input | main.rs:727:13:727:17 | Input |
+| main.rs:750:19:750:22 | Self | main.rs:725:5:757:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:750:19:750:29 | ...::Input | main.rs:735:9:739:9 | type Input |
+| main.rs:751:14:754:9 | Result::<...> | {EXTERNAL LOCATION} | enum Result |
+| main.rs:752:13:752:16 | Self | main.rs:725:5:757:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:752:13:752:24 | ...::Output | main.rs:743:11:746:9 | type Output |
+| main.rs:753:13:753:16 | Self | main.rs:725:5:757:5 | impl Reduce for MyImpl::<...> { ... } |
+| main.rs:753:13:753:23 | ...::Error | main.rs:739:11:743:9 | type Error |
+| main.rs:760:5:760:7 | std | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:760:11:760:14 | self | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:762:15:762:17 | ztd | {EXTERNAL LOCATION} | Crate(std@0.0.0) |
+| main.rs:762:15:762:25 | ...::string | {EXTERNAL LOCATION} | mod string |
+| main.rs:762:15:762:33 | ...::String | {EXTERNAL LOCATION} | struct String |
+| main.rs:765:5:765:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:765:5:765:14 | ...::nested | my.rs:1:1:1:15 | mod nested |
+| main.rs:765:5:765:23 | ...::nested1 | my/nested.rs:1:1:17:1 | mod nested1 |
+| main.rs:765:5:765:32 | ...::nested2 | my/nested.rs:2:5:11:5 | mod nested2 |
+| main.rs:765:5:765:35 | ...::f | my/nested.rs:3:9:5:9 | fn f |
+| main.rs:766:5:766:6 | my | main.rs:1:1:1:7 | mod my |
+| main.rs:766:5:766:9 | ...::f | my.rs:5:1:7:1 | fn f |
+| main.rs:767:5:767:11 | nested2 | my2/mod.rs:1:1:1:16 | mod nested2 |
+| main.rs:767:5:767:20 | ...::nested3 | my2/nested2.rs:1:1:11:1 | mod nested3 |
+| main.rs:767:5:767:29 | ...::nested4 | my2/nested2.rs:2:5:10:5 | mod nested4 |
+| main.rs:767:5:767:32 | ...::f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:768:5:768:5 | f | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:769:5:769:5 | g | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:770:5:770:9 | crate | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:770:5:770:12 | ...::h | main.rs:50:1:69:1 | fn h |
+| main.rs:771:5:771:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:771:5:771:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:771:5:771:13 | ...::g | main.rs:23:9:27:9 | fn g |
+| main.rs:772:5:772:6 | m1 | main.rs:13:1:37:1 | mod m1 |
+| main.rs:772:5:772:10 | ...::m2 | main.rs:18:5:36:5 | mod m2 |
+| main.rs:772:5:772:14 | ...::m3 | main.rs:29:9:35:9 | mod m3 |
+| main.rs:772:5:772:17 | ...::h | main.rs:30:27:34:13 | fn h |
+| main.rs:773:5:773:6 | m4 | main.rs:39:1:46:1 | mod m4 |
+| main.rs:773:5:773:9 | ...::i | main.rs:42:5:45:5 | fn i |
+| main.rs:774:5:774:5 | h | main.rs:50:1:69:1 | fn h |
+| main.rs:775:5:775:11 | f_alias | my2/nested2.rs:3:9:5:9 | fn f |
+| main.rs:776:5:776:11 | g_alias | my2/nested2.rs:7:9:9:9 | fn g |
+| main.rs:777:5:777:5 | j | main.rs:97:1:101:1 | fn j |
+| main.rs:778:5:778:6 | m6 | main.rs:109:1:120:1 | mod m6 |
+| main.rs:778:5:778:9 | ...::g | main.rs:114:5:119:5 | fn g |
+| main.rs:779:5:779:6 | m7 | main.rs:122:1:141:1 | mod m7 |
+| main.rs:779:5:779:9 | ...::f | main.rs:133:5:140:5 | fn f |
+| main.rs:780:5:780:6 | m8 | main.rs:143:1:197:1 | mod m8 |
+| main.rs:780:5:780:9 | ...::g | main.rs:181:5:196:5 | fn g |
+| main.rs:781:5:781:6 | m9 | main.rs:199:1:207:1 | mod m9 |
+| main.rs:781:5:781:9 | ...::f | main.rs:202:5:206:5 | fn f |
+| main.rs:782:5:782:7 | m11 | main.rs:230:1:267:1 | mod m11 |
+| main.rs:782:5:782:10 | ...::f | main.rs:235:5:238:5 | fn f |
+| main.rs:783:5:783:7 | m15 | main.rs:298:1:367:1 | mod m15 |
+| main.rs:783:5:783:10 | ...::f | main.rs:354:5:366:5 | fn f |
+| main.rs:784:5:784:7 | m16 | main.rs:369:1:461:1 | mod m16 |
+| main.rs:784:5:784:10 | ...::f | main.rs:436:5:460:5 | fn f |
+| main.rs:785:5:785:20 | trait_visibility | main.rs:463:1:513:1 | mod trait_visibility |
+| main.rs:785:5:785:23 | ...::f | main.rs:490:5:512:5 | fn f |
+| main.rs:786:5:786:7 | m17 | main.rs:515:1:545:1 | mod m17 |
+| main.rs:786:5:786:10 | ...::f | main.rs:539:5:544:5 | fn f |
+| main.rs:787:5:787:11 | nested6 | my2/nested2.rs:14:5:18:5 | mod nested6 |
+| main.rs:787:5:787:14 | ...::f | my2/nested2.rs:15:9:17:9 | fn f |
+| main.rs:788:5:788:11 | nested8 | my2/nested2.rs:22:5:26:5 | mod nested8 |
+| main.rs:788:5:788:14 | ...::f | my2/nested2.rs:23:9:25:9 | fn f |
+| main.rs:789:5:789:7 | my3 | my2/mod.rs:12:1:12:12 | mod my3 |
+| main.rs:789:5:789:10 | ...::f | my2/my3/mod.rs:1:1:5:1 | fn f |
+| main.rs:790:5:790:12 | nested_f | my/my4/my5/mod.rs:1:1:3:1 | fn f |
+| main.rs:791:5:791:7 | m18 | main.rs:547:1:565:1 | mod m18 |
+| main.rs:791:5:791:12 | ...::m19 | main.rs:552:5:564:5 | mod m19 |
+| main.rs:791:5:791:17 | ...::m20 | main.rs:557:9:563:9 | mod m20 |
+| main.rs:791:5:791:20 | ...::g | main.rs:558:13:562:13 | fn g |
+| main.rs:792:5:792:7 | m23 | main.rs:594:1:619:1 | mod m23 |
+| main.rs:792:5:792:10 | ...::f | main.rs:614:5:618:5 | fn f |
+| main.rs:793:5:793:7 | m24 | main.rs:621:1:689:1 | mod m24 |
+| main.rs:793:5:793:10 | ...::f | main.rs:675:5:688:5 | fn f |
+| main.rs:794:5:794:8 | zelf | main.rs:0:0:0:0 | Crate(main@0.0.1) |
+| main.rs:794:5:794:11 | ...::h | main.rs:50:1:69:1 | fn h |
+| main.rs:796:5:796:11 | AStruct | main.rs:696:1:696:17 | struct AStruct |
+| main.rs:797:5:797:11 | AStruct | main.rs:696:1:696:17 | struct AStruct |
 | 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 |
@@ -404,7 +427,7 @@ resolvePath
 | 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:17:30 | SourceFile |
-| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:746:2 | SourceFile |
+| my2/my3/mod.rs:7:5:7:16 | ...::super | main.rs:1:1:799: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:17:30 | SourceFile |
 | my2/my3/mod.rs:8:5:8:12 | ...::g | my2/mod.rs:3:1:6:1 | fn g |
diff --git a/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index 0b4e0c12d0c8..000000000000
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-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/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
index d2fded7a0730..d2aa2f396c73 100644
--- a/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/library-tests/type-inference/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,8 +1,8 @@
 multipleCallTargets
 | dereference.rs:61:15:61:24 | e1.deref() |
-| main.rs:2308:13:2308:31 | ...::from(...) |
-| main.rs:2309:13:2309:31 | ...::from(...) |
-| main.rs:2310:13:2310:31 | ...::from(...) |
-| main.rs:2316:13:2316:31 | ...::from(...) |
-| main.rs:2317:13:2317:31 | ...::from(...) |
-| main.rs:2318:13:2318:31 | ...::from(...) |
+| main.rs:2357:13:2357:31 | ...::from(...) |
+| main.rs:2358:13:2358:31 | ...::from(...) |
+| main.rs:2359:13:2359:31 | ...::from(...) |
+| main.rs:2365:13:2365:31 | ...::from(...) |
+| main.rs:2366:13:2366:31 | ...::from(...) |
+| main.rs:2367:13:2367:31 | ...::from(...) |
diff --git a/rust/ql/test/library-tests/type-inference/main.rs b/rust/ql/test/library-tests/type-inference/main.rs
index e6dc211060cc..038ab8be29f3 100644
--- a/rust/ql/test/library-tests/type-inference/main.rs
+++ b/rust/ql/test/library-tests/type-inference/main.rs
@@ -121,6 +121,55 @@ mod trait_impl {
     }
 }
 
+mod trait_visibility {
+    // In this test the correct method target depends on which trait is visible.
+
+    mod m {
+        pub trait Foo {
+            // Foo::a_method
+            fn a_method(&self) {
+                println!("foo!");
+            }
+        }
+
+        pub trait Bar {
+            // Bar::a_method
+            fn a_method(&self) {
+                println!("bar!");
+            }
+        }
+
+        pub struct X;
+        impl Foo for X {}
+        impl Bar for X {}
+    }
+
+    use m::X;
+
+    fn main() {
+        let x = X;
+        {
+            use m::Foo;
+            x.a_method(); // $ target=Foo::a_method
+        }
+        {
+            use m::Bar;
+            x.a_method(); // $ target=Bar::a_method
+        }
+        {
+            use m::Bar as _;
+            x.a_method(); // $ target=Bar::a_method
+        }
+        {
+            use m::Bar;
+            use m::Foo;
+            // x.a_method();  // This would be ambiguous
+            Foo::a_method(&x); // $ target=Foo::a_method
+            Bar::a_method(&x); // $ target=Bar::a_method
+        }
+    }
+}
+
 mod method_non_parametric_impl {
     #[derive(Debug)]
     struct MyThing<A> {
@@ -2332,6 +2381,8 @@ mod loops {
         for u in [0u8..10] {} // $ type=u:Range type=u:Idx.u8
         let range = 0..10; // $ type=range:Range type=range:Idx.i32
         for i in range {} // $ type=i:i32
+        let range_full = ..; // $ type=range_full:RangeFull
+        for i in &[1i64, 2i64, 3i64][range_full] {} // $ target=index MISSING: type=i:&T.i64
 
         let range1 = // $ type=range1:Range type=range1:Idx.u16
         std::ops::Range {
@@ -2558,12 +2609,11 @@ pub mod exec {
 pub mod path_buf {
     // a highly simplified model of `PathBuf::canonicalize`
 
-    pub struct Path {
-    }
+    pub struct Path {}
 
     impl Path {
         pub const fn new() -> Path {
-            Path { }
+            Path {}
         }
 
         pub fn canonicalize(&self) -> Result<PathBuf, ()> {
@@ -2571,12 +2621,11 @@ pub mod path_buf {
         }
     }
 
-    pub struct PathBuf {
-    }
+    pub struct PathBuf {}
 
     impl PathBuf {
         pub const fn new() -> PathBuf {
-            PathBuf { }
+            PathBuf {}
         }
     }
 
@@ -2587,7 +2636,7 @@ pub mod path_buf {
         #[inline]
         fn deref(&self) -> &Path {
             // (very much not a real implementation)
-            static path : Path = Path::new(); // $ target=new
+            static path: Path = Path::new(); // $ target=new
             &path
         }
     }
diff --git a/rust/ql/test/library-tests/type-inference/pattern_matching.rs b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
index 28da3e1ab580..30ddd61444e7 100755
--- a/rust/ql/test/library-tests/type-inference/pattern_matching.rs
+++ b/rust/ql/test/library-tests/type-inference/pattern_matching.rs
@@ -482,6 +482,19 @@ pub fn tuple_patterns() {
             println!("Single element tuple: {}", single_elem);
         }
     }
+
+    // Tuple pattern on reference to tuple in `let` expression
+    let ref_tuple1: &(i32, i32) = &(1, 2);
+    if let (n, m) = ref_tuple1 {
+        println!("n: {}", n);
+        println!("m: {}", m);
+    }
+
+    // Tuple pattern on reference to tuple in `let` statement
+    let ref_tuple2: &(i32, i32) = &(1, 2);
+    let (n, m) = ref_tuple2;
+    println!("n: {}", n);
+    println!("m: {}", m);
 }
 
 pub fn parenthesized_patterns() {
diff --git a/rust/ql/test/library-tests/type-inference/type-inference.expected b/rust/ql/test/library-tests/type-inference/type-inference.expected
index 1fb5a612918f..158af57728ff 100644
--- a/rust/ql/test/library-tests/type-inference/type-inference.expected
+++ b/rust/ql/test/library-tests/type-inference/type-inference.expected
@@ -787,4212 +787,4238 @@ inferType
 | main.rs:120:13:120:13 | b |  | {EXTERNAL LOCATION} | bool |
 | main.rs:120:17:120:40 | ...::trait_method(...) |  | {EXTERNAL LOCATION} | bool |
 | main.rs:120:39:120:39 | y |  | main.rs:99:5:102:5 | MyThing |
-| main.rs:137:15:137:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:137:15:137:18 | SelfParam | A | main.rs:130:5:131:14 | S1 |
-| main.rs:137:27:139:9 | { ... } |  | main.rs:130:5:131:14 | S1 |
-| main.rs:138:13:138:16 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:138:13:138:16 | self | A | main.rs:130:5:131:14 | S1 |
-| main.rs:138:13:138:18 | self.a |  | main.rs:130:5:131:14 | S1 |
-| main.rs:144:15:144:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:144:15:144:18 | SelfParam | A | main.rs:132:5:133:14 | S2 |
-| main.rs:144:29:146:9 | { ... } |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:144:29:146:9 | { ... } | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:13:145:30 | Self {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:145:13:145:30 | Self {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:23:145:26 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:145:23:145:26 | self | A | main.rs:132:5:133:14 | S2 |
-| main.rs:145:23:145:28 | self.a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:150:15:150:18 | SelfParam |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:150:15:150:18 | SelfParam | A | main.rs:149:10:149:10 | T |
-| main.rs:150:26:152:9 | { ... } |  | main.rs:149:10:149:10 | T |
-| main.rs:151:13:151:16 | self |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:151:13:151:16 | self | A | main.rs:149:10:149:10 | T |
-| main.rs:151:13:151:18 | self.a |  | main.rs:149:10:149:10 | T |
-| main.rs:156:13:156:13 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:156:13:156:13 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:156:17:156:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:156:17:156:33 | MyThing {...} | A | main.rs:130:5:131:14 | S1 |
-| main.rs:156:30:156:31 | S1 |  | main.rs:130:5:131:14 | S1 |
-| main.rs:157:13:157:13 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:157:13:157:13 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:157:17:157:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:157:17:157:33 | MyThing {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:157:30:157:31 | S2 |  | main.rs:132:5:133:14 | S2 |
-| main.rs:160:18:160:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:160:18:160:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:160:18:160:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:160:18:160:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:160:26:160:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:160:26:160:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:160:26:160:28 | x.a |  | main.rs:130:5:131:14 | S1 |
-| main.rs:161:18:161:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:161:18:161:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:161:18:161:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:161:18:161:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:161:26:161:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:161:26:161:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:161:26:161:28 | y.a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:163:18:163:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:163:18:163:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:163:18:163:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:163:18:163:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:163:26:163:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:163:26:163:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:163:26:163:31 | x.m1() |  | main.rs:130:5:131:14 | S1 |
-| main.rs:164:18:164:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:164:18:164:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:164:18:164:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:164:18:164:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:164:26:164:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:164:26:164:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:164:26:164:31 | y.m1() |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:164:26:164:31 | y.m1() | A | main.rs:132:5:133:14 | S2 |
-| main.rs:164:26:164:33 | ... .a |  | main.rs:132:5:133:14 | S2 |
-| main.rs:166:13:166:13 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:166:13:166:13 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:166:17:166:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:166:17:166:33 | MyThing {...} | A | main.rs:130:5:131:14 | S1 |
-| main.rs:166:30:166:31 | S1 |  | main.rs:130:5:131:14 | S1 |
-| main.rs:167:13:167:13 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:167:13:167:13 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:167:17:167:33 | MyThing {...} |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:167:17:167:33 | MyThing {...} | A | main.rs:132:5:133:14 | S2 |
-| main.rs:167:30:167:31 | S2 |  | main.rs:132:5:133:14 | S2 |
-| main.rs:169:18:169:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:169:18:169:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:169:18:169:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:169:18:169:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:169:26:169:26 | x |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:169:26:169:26 | x | A | main.rs:130:5:131:14 | S1 |
-| main.rs:169:26:169:31 | x.m2() |  | main.rs:130:5:131:14 | S1 |
-| main.rs:170:18:170:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:170:18:170:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:170:18:170:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:170:18:170:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:170:26:170:26 | y |  | main.rs:125:5:128:5 | MyThing |
-| main.rs:170:26:170:26 | y | A | main.rs:132:5:133:14 | S2 |
-| main.rs:170:26:170:31 | y.m2() |  | main.rs:132:5:133:14 | S2 |
-| main.rs:194:15:194:18 | SelfParam |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:196:15:196:18 | SelfParam |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:199:9:201:9 | { ... } |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:200:13:200:16 | self |  | main.rs:193:5:202:5 | Self [trait MyTrait] |
-| main.rs:206:16:206:19 | SelfParam |  | main.rs:204:5:209:5 | Self [trait MyProduct] |
-| main.rs:208:16:208:19 | SelfParam |  | main.rs:204:5:209:5 | Self [trait MyProduct] |
-| main.rs:211:43:211:43 | x |  | main.rs:211:26:211:40 | T2 |
-| main.rs:211:56:213:5 | { ... } |  | main.rs:211:22:211:23 | T1 |
-| main.rs:212:9:212:9 | x |  | main.rs:211:26:211:40 | T2 |
-| main.rs:212:9:212:14 | x.m1() |  | main.rs:211:22:211:23 | T1 |
-| main.rs:217:15:217:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:217:15:217:18 | SelfParam | A | main.rs:186:5:187:14 | S1 |
-| main.rs:217:27:219:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:218:13:218:16 | self |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:218:13:218:16 | self | A | main.rs:186:5:187:14 | S1 |
-| main.rs:218:13:218:18 | self.a |  | main.rs:186:5:187:14 | S1 |
-| main.rs:224:15:224:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:224:15:224:18 | SelfParam | A | main.rs:188:5:189:14 | S2 |
-| main.rs:224:29:226:9 | { ... } |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:224:29:226:9 | { ... } | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:13:225:30 | Self {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:225:13:225:30 | Self {...} | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:23:225:26 | self |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:225:23:225:26 | self | A | main.rs:188:5:189:14 | S2 |
-| main.rs:225:23:225:28 | self.a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:236:15:236:18 | SelfParam |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:236:15:236:18 | SelfParam | A | main.rs:190:5:191:14 | S3 |
-| main.rs:236:27:238:9 | { ... } |  | main.rs:231:10:231:11 | TD |
-| main.rs:237:13:237:25 | ...::default(...) |  | main.rs:231:10:231:11 | TD |
-| main.rs:243:15:243:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:243:15:243:18 | SelfParam | P1 | main.rs:241:10:241:10 | I |
-| main.rs:243:15:243:18 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:243:26:245:9 | { ... } |  | main.rs:241:10:241:10 | I |
-| main.rs:244:13:244:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:244:13:244:16 | self | P1 | main.rs:241:10:241:10 | I |
-| main.rs:244:13:244:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:244:13:244:19 | self.p1 |  | main.rs:241:10:241:10 | I |
-| main.rs:250:15:250:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:250:15:250:18 | SelfParam | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:250:15:250:18 | SelfParam | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:250:27:252:9 | { ... } |  | main.rs:190:5:191:14 | S3 |
-| main.rs:251:13:251:14 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:257:15:257:18 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:257:15:257:18 | SelfParam | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:257:15:257:18 | SelfParam | P1.A | main.rs:255:10:255:11 | TT |
-| main.rs:257:15:257:18 | SelfParam | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:257:27:260:9 | { ... } |  | main.rs:255:10:255:11 | TT |
-| main.rs:258:17:258:21 | alpha |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:17:258:21 | alpha | A | main.rs:255:10:255:11 | TT |
-| main.rs:258:25:258:28 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:258:25:258:28 | self | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:25:258:28 | self | P1.A | main.rs:255:10:255:11 | TT |
-| main.rs:258:25:258:28 | self | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:258:25:258:31 | self.p1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:258:25:258:31 | self.p1 | A | main.rs:255:10:255:11 | TT |
-| main.rs:259:13:259:17 | alpha |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:259:13:259:17 | alpha | A | main.rs:255:10:255:11 | TT |
-| main.rs:259:13:259:19 | alpha.a |  | main.rs:255:10:255:11 | TT |
-| main.rs:266:16:266:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:266:16:266:19 | SelfParam | P1 | main.rs:264:10:264:10 | A |
-| main.rs:266:16:266:19 | SelfParam | P2 | main.rs:264:10:264:10 | A |
-| main.rs:266:27:268:9 | { ... } |  | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:267:13:267:16 | self | P1 | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:16 | self | P2 | main.rs:264:10:264:10 | A |
-| main.rs:267:13:267:19 | self.p1 |  | main.rs:264:10:264:10 | A |
-| main.rs:271:16:271:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:271:16:271:19 | SelfParam | P1 | main.rs:264:10:264:10 | A |
-| main.rs:271:16:271:19 | SelfParam | P2 | main.rs:264:10:264:10 | A |
-| main.rs:271:27:273:9 | { ... } |  | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:272:13:272:16 | self | P1 | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:16 | self | P2 | main.rs:264:10:264:10 | A |
-| main.rs:272:13:272:19 | self.p2 |  | main.rs:264:10:264:10 | A |
-| main.rs:279:16:279:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:279:16:279:19 | SelfParam | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:279:16:279:19 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:279:28:281:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:280:13:280:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:280:13:280:16 | self | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:280:13:280:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:280:13:280:19 | self.p2 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:284:16:284:19 | SelfParam |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:284:16:284:19 | SelfParam | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:284:16:284:19 | SelfParam | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:284:28:286:9 | { ... } |  | main.rs:188:5:189:14 | S2 |
-| main.rs:285:13:285:16 | self |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:285:13:285:16 | self | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:285:13:285:16 | self | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:285:13:285:19 | self.p1 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:289:46:289:46 | p |  | main.rs:289:24:289:43 | P |
-| main.rs:289:58:291:5 | { ... } |  | main.rs:289:16:289:17 | V1 |
-| main.rs:290:9:290:9 | p |  | main.rs:289:24:289:43 | P |
-| main.rs:290:9:290:15 | p.fst() |  | main.rs:289:16:289:17 | V1 |
-| main.rs:293:46:293:46 | p |  | main.rs:293:24:293:43 | P |
-| main.rs:293:58:295:5 | { ... } |  | main.rs:293:20:293:21 | V2 |
-| main.rs:294:9:294:9 | p |  | main.rs:293:24:293:43 | P |
-| main.rs:294:9:294:15 | p.snd() |  | main.rs:293:20:293:21 | V2 |
-| main.rs:297:54:297:54 | p |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:297:54:297:54 | p | P1 | main.rs:297:20:297:21 | V0 |
-| main.rs:297:54:297:54 | p | P2 | main.rs:297:32:297:51 | P |
-| main.rs:297:78:299:5 | { ... } |  | main.rs:297:24:297:25 | V1 |
-| main.rs:298:9:298:9 | p |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:298:9:298:9 | p | P1 | main.rs:297:20:297:21 | V0 |
-| main.rs:298:9:298:9 | p | P2 | main.rs:297:32:297:51 | P |
-| main.rs:298:9:298:12 | p.p2 |  | main.rs:297:32:297:51 | P |
-| main.rs:298:9:298:18 | ... .fst() |  | main.rs:297:24:297:25 | V1 |
-| main.rs:303:23:303:26 | SelfParam |  | main.rs:301:5:304:5 | Self [trait ConvertTo] |
-| main.rs:308:23:308:26 | SelfParam |  | main.rs:306:10:306:23 | T |
-| main.rs:308:35:310:9 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:309:13:309:16 | self |  | main.rs:306:10:306:23 | T |
-| main.rs:309:13:309:21 | self.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:313:41:313:45 | thing |  | main.rs:313:23:313:38 | T |
-| main.rs:313:57:315:5 | { ... } |  | main.rs:313:19:313:20 | TS |
-| main.rs:314:9:314:13 | thing |  | main.rs:313:23:313:38 | T |
-| main.rs:314:9:314:26 | thing.convert_to() |  | main.rs:313:19:313:20 | TS |
-| main.rs:317:56:317:60 | thing |  | main.rs:317:39:317:53 | TP |
-| main.rs:317:73:320:5 | { ... } |  | main.rs:186:5:187:14 | S1 |
-| main.rs:319:9:319:13 | thing |  | main.rs:317:39:317:53 | TP |
-| main.rs:319:9:319:26 | thing.convert_to() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:323:13:323:20 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:323:13:323:20 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:323:24:323:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:323:24:323:40 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:323:37:323:38 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:324:13:324:20 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:324:13:324:20 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:324:24:324:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:324:24:324:40 | MyThing {...} | A | main.rs:188:5:189:14 | S2 |
-| main.rs:324:37:324:38 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:325:13:325:20 | thing_s3 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:325:13:325:20 | thing_s3 | A | main.rs:190:5:191:14 | S3 |
-| main.rs:325:24:325:40 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:325:24:325:40 | MyThing {...} | A | main.rs:190:5:191:14 | S3 |
-| main.rs:325:37:325:38 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:329:18:329:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:329:18:329:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:329:18:329:38 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:329:18:329:38 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:329:26:329:33 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:329:26:329:33 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:329:26:329:38 | thing_s1.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:330:18:330:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:330:18:330:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:330:18:330:40 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:330:18:330:40 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:330:26:330:33 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:330:26:330:33 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:330:26:330:38 | thing_s2.m1() |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:330:26:330:38 | thing_s2.m1() | A | main.rs:188:5:189:14 | S2 |
-| main.rs:330:26:330:40 | ... .a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:331:13:331:14 | s3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:331:22:331:29 | thing_s3 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:331:22:331:29 | thing_s3 | A | main.rs:190:5:191:14 | S3 |
-| main.rs:331:22:331:34 | thing_s3.m1() |  | main.rs:190:5:191:14 | S3 |
-| main.rs:332:18:332:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:332:18:332:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:332:18:332:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:332:18:332:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:332:26:332:27 | s3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:334:13:334:14 | p1 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:334:13:334:14 | p1 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:13:334:14 | p1 | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:18:334:42 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:334:18:334:42 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:18:334:42 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:334:31:334:32 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:334:39:334:40 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:335:18:335:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:335:18:335:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:335:18:335:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:335:18:335:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:335:26:335:27 | p1 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:335:26:335:27 | p1 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:335:26:335:27 | p1 | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:335:26:335:32 | p1.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:337:13:337:14 | p2 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:337:13:337:14 | p2 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:337:13:337:14 | p2 | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:337:18:337:42 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:337:18:337:42 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:337:18:337:42 | MyPair {...} | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:337:31:337:32 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:337:39:337:40 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:338:18:338:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:338:18:338:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:338:18:338:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:338:18:338:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:338:26:338:27 | p2 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:338:26:338:27 | p2 | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:338:26:338:27 | p2 | P2 | main.rs:188:5:189:14 | S2 |
-| main.rs:338:26:338:32 | p2.m1() |  | main.rs:190:5:191:14 | S3 |
-| main.rs:340:13:340:14 | p3 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:340:13:340:14 | p3 | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:340:13:340:14 | p3 | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:340:13:340:14 | p3 | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:340:18:343:9 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:340:18:343:9 | MyPair {...} | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:340:18:343:9 | MyPair {...} | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:340:18:343:9 | MyPair {...} | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:341:17:341:33 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:341:17:341:33 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:341:30:341:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:342:17:342:18 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:344:18:344:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:344:18:344:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:344:18:344:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:344:18:344:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:344:26:344:27 | p3 |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:344:26:344:27 | p3 | P1 | main.rs:175:5:178:5 | MyThing |
-| main.rs:344:26:344:27 | p3 | P1.A | main.rs:186:5:187:14 | S1 |
-| main.rs:344:26:344:27 | p3 | P2 | main.rs:190:5:191:14 | S3 |
-| main.rs:344:26:344:32 | p3.m1() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:347:13:347:13 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:347:13:347:13 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:13:347:13 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:17:347:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:347:17:347:41 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:17:347:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:347:30:347:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:347:38:347:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:348:13:348:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:17 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:348:17:348:17 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:17 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:348:17:348:23 | a.fst() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:349:18:349:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:349:18:349:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:349:18:349:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:349:18:349:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:349:26:349:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:350:13:350:13 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:17 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:350:17:350:17 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:17 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:350:17:350:23 | a.snd() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:351:18:351:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:351:18:351:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:351:18:351:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:351:18:351:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:351:26:351:26 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:357:13:357:13 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:357:13:357:13 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:357:13:357:13 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:357:17:357:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:357:17:357:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:357:17:357:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:357:30:357:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:357:38:357:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:358:13:358:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:358:17:358:17 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:358:17:358:17 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:358:17:358:17 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:358:17:358:23 | b.fst() |  | main.rs:186:5:187:14 | S1 |
-| main.rs:359:18:359:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:359:18:359:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:359:18:359:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:359:18:359:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:359:26:359:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:360:13:360:13 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:360:17:360:17 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:360:17:360:17 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:360:17:360:17 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:360:17:360:23 | b.snd() |  | main.rs:188:5:189:14 | S2 |
-| main.rs:361:18:361:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:361:18:361:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:361:18:361:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:361:18:361:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:361:26:361:26 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:365:13:365:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:365:17:365:39 | call_trait_m1(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:365:31:365:38 | thing_s1 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:365:31:365:38 | thing_s1 | A | main.rs:186:5:187:14 | S1 |
-| main.rs:366:18:366:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:366:18:366:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:366:18:366:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:366:18:366:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:366:26:366:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:367:13:367:13 | y |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:13:367:13 | y | A | main.rs:188:5:189:14 | S2 |
-| main.rs:367:17:367:39 | call_trait_m1(...) |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:17:367:39 | call_trait_m1(...) | A | main.rs:188:5:189:14 | S2 |
-| main.rs:367:31:367:38 | thing_s2 |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:367:31:367:38 | thing_s2 | A | main.rs:188:5:189:14 | S2 |
-| main.rs:368:18:368:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:368:18:368:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:368:18:368:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:368:18:368:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:368:26:368:26 | y |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:368:26:368:26 | y | A | main.rs:188:5:189:14 | S2 |
-| main.rs:368:26:368:28 | y.a |  | main.rs:188:5:189:14 | S2 |
-| main.rs:371:13:371:13 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:371:13:371:13 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:13:371:13 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:17:371:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:371:17:371:41 | MyPair {...} | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:17:371:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:371:30:371:31 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:371:38:371:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:13:372:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:17:372:26 | get_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:372:25:372:25 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:372:25:372:25 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:372:25:372:25 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:373:18:373:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:373:18:373:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:373:18:373:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:373:18:373:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:373:26:373:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:13:374:13 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:17:374:26 | get_snd(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:374:25:374:25 | a |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:374:25:374:25 | a | P1 | main.rs:186:5:187:14 | S1 |
-| main.rs:374:25:374:25 | a | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:375:18:375:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:375:18:375:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:375:18:375:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:375:18:375:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:375:26:375:26 | y |  | main.rs:186:5:187:14 | S1 |
-| main.rs:378:13:378:13 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:378:13:378:13 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:378:13:378:13 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:378:17:378:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:378:17:378:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:378:17:378:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:378:30:378:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:378:38:378:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:13:379:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:17:379:26 | get_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:379:25:379:25 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:379:25:379:25 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:379:25:379:25 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:380:18:380:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:380:18:380:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:380:18:380:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:380:18:380:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:380:26:380:26 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:381:13:381:13 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:381:17:381:26 | get_snd(...) |  | main.rs:188:5:189:14 | S2 |
-| main.rs:381:25:381:25 | b |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:381:25:381:25 | b | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:381:25:381:25 | b | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:382:18:382:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:382:18:382:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:382:18:382:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:382:18:382:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:382:26:382:26 | y |  | main.rs:188:5:189:14 | S2 |
-| main.rs:384:13:384:13 | c |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:13:384:13 | c | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:384:13:384:13 | c | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:13:384:13 | c | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:384:13:384:13 | c | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:384:17:387:9 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:17:387:9 | MyPair {...} | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:384:17:387:9 | MyPair {...} | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:384:17:387:9 | MyPair {...} | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:384:17:387:9 | MyPair {...} | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:385:17:385:18 | S3 |  | main.rs:190:5:191:14 | S3 |
-| main.rs:386:17:386:41 | MyPair {...} |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:386:17:386:41 | MyPair {...} | P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:386:17:386:41 | MyPair {...} | P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:386:30:386:31 | S2 |  | main.rs:188:5:189:14 | S2 |
-| main.rs:386:38:386:39 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:13:388:13 | x |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:17:388:30 | get_snd_fst(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:388:29:388:29 | c |  | main.rs:180:5:184:5 | MyPair |
-| main.rs:388:29:388:29 | c | P1 | main.rs:190:5:191:14 | S3 |
-| main.rs:388:29:388:29 | c | P2 | main.rs:180:5:184:5 | MyPair |
-| main.rs:388:29:388:29 | c | P2.P1 | main.rs:188:5:189:14 | S2 |
-| main.rs:388:29:388:29 | c | P2.P2 | main.rs:186:5:187:14 | S1 |
-| main.rs:390:13:390:17 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:390:13:390:17 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:390:21:390:37 | MyThing {...} |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:390:21:390:37 | MyThing {...} | A | main.rs:186:5:187:14 | S1 |
-| main.rs:390:34:390:35 | S1 |  | main.rs:186:5:187:14 | S1 |
-| main.rs:391:17:391:21 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:391:17:391:21 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:392:13:392:13 | j |  | main.rs:186:5:187:14 | S1 |
-| main.rs:392:17:392:33 | convert_to(...) |  | main.rs:186:5:187:14 | S1 |
-| main.rs:392:28:392:32 | thing |  | main.rs:175:5:178:5 | MyThing |
-| main.rs:392:28:392:32 | thing | A | main.rs:186:5:187:14 | S1 |
-| main.rs:401:26:401:29 | SelfParam |  | main.rs:400:5:404:5 | Self [trait OverlappingTrait] |
-| main.rs:403:28:403:31 | SelfParam |  | main.rs:400:5:404:5 | Self [trait OverlappingTrait] |
-| main.rs:403:34:403:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:408:26:408:29 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:408:38:410:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:409:13:409:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:28:413:31 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:34:413:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:413:48:415:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:414:13:414:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:420:26:420:29 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:420:38:422:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:421:13:421:16 | self |  | main.rs:397:5:398:14 | S1 |
-| main.rs:425:28:425:31 | SelfParam |  | main.rs:397:5:398:14 | S1 |
-| main.rs:425:40:427:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:426:13:426:16 | self |  | main.rs:397:5:398:14 | S1 |
-| main.rs:434:26:434:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:434:26:434:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:434:38:436:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:435:13:435:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:439:28:439:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:439:28:439:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:439:40:441:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:440:13:440:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:446:26:446:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:446:26:446:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:446:38:448:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:447:13:447:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:451:28:451:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:451:28:451:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:451:34:451:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:451:48:453:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:452:13:452:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:458:26:458:29 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:458:26:458:29 | SelfParam | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:458:38:460:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:459:13:459:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:463:28:463:31 | SelfParam |  | main.rs:430:5:430:22 | S2 |
-| main.rs:463:28:463:31 | SelfParam | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:463:34:463:35 | s1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:463:48:465:9 | { ... } |  | main.rs:397:5:398:14 | S1 |
-| main.rs:464:13:464:14 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:472:14:472:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:472:14:472:18 | SelfParam | &T | main.rs:471:5:473:5 | Self [trait OverlappingTrait2] |
-| main.rs:472:21:472:21 | x |  | file://:0:0:0:0 | & |
-| main.rs:472:21:472:21 | x | &T | main.rs:471:29:471:29 | T |
-| main.rs:477:14:477:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:477:14:477:18 | SelfParam | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:477:14:477:18 | SelfParam | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:477:21:477:21 | x |  | file://:0:0:0:0 | & |
-| main.rs:477:21:477:21 | x | &T | main.rs:475:10:475:10 | T |
-| main.rs:477:37:479:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:477:37:479:9 | { ... } | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:477:37:479:9 | { ... } | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:478:13:478:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:478:13:478:16 | self | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:478:13:478:16 | self | &T.T3 | main.rs:475:10:475:10 | T |
-| main.rs:484:14:484:18 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:484:14:484:18 | SelfParam | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:484:14:484:18 | SelfParam | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:484:21:484:21 | x |  | main.rs:482:10:482:10 | T |
-| main.rs:484:36:486:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:484:36:486:9 | { ... } | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:484:36:486:9 | { ... } | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:485:13:485:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:485:13:485:16 | self | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:485:13:485:16 | self | &T.T3 | main.rs:482:10:482:10 | T |
-| main.rs:490:13:490:13 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:490:17:490:18 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:491:18:491:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:491:18:491:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:491:18:491:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:491:18:491:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:491:26:491:26 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:491:26:491:42 | x.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:492:18:492:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:492:18:492:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:492:18:492:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:492:18:492:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:492:26:492:26 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:492:26:492:44 | x.common_method_2() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:494:13:494:13 | y |  | main.rs:430:5:430:22 | S2 |
-| main.rs:494:13:494:13 | y | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:494:17:494:22 | S2(...) |  | main.rs:430:5:430:22 | S2 |
-| main.rs:494:17:494:22 | S2(...) | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:494:20:494:21 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:495:18:495:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:495:18:495:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:495:18:495:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:495:18:495:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:495:26:495:26 | y |  | main.rs:430:5:430:22 | S2 |
-| main.rs:495:26:495:26 | y | T2 | main.rs:397:5:398:14 | S1 |
-| main.rs:495:26:495:42 | y.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:497:13:497:13 | z |  | main.rs:430:5:430:22 | S2 |
-| main.rs:497:13:497:13 | z | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:497:17:497:21 | S2(...) |  | main.rs:430:5:430:22 | S2 |
-| main.rs:497:17:497:21 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:497:20:497:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:498:18:498:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:498:18:498:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:498:18:498:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:498:18:498:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:498:26:498:26 | z |  | main.rs:430:5:430:22 | S2 |
-| main.rs:498:26:498:26 | z | T2 | {EXTERNAL LOCATION} | i32 |
-| main.rs:498:26:498:42 | z.common_method() |  | main.rs:397:5:398:14 | S1 |
-| main.rs:500:13:500:13 | w |  | main.rs:468:5:469:22 | S3 |
-| main.rs:500:13:500:13 | w | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:500:17:500:22 | S3(...) |  | main.rs:468:5:469:22 | S3 |
-| main.rs:500:17:500:22 | S3(...) | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:500:20:500:21 | S1 |  | main.rs:397:5:398:14 | S1 |
-| main.rs:501:18:501:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:501:18:501:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:501:18:501:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:501:18:501:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:501:26:501:26 | w |  | main.rs:468:5:469:22 | S3 |
-| main.rs:501:26:501:26 | w | T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:501:26:501:31 | w.m(...) |  | file://:0:0:0:0 | & |
-| main.rs:501:26:501:31 | w.m(...) | &T | main.rs:468:5:469:22 | S3 |
-| main.rs:501:26:501:31 | w.m(...) | &T.T3 | main.rs:397:5:398:14 | S1 |
-| main.rs:501:30:501:30 | x |  | main.rs:397:5:398:14 | S1 |
-| main.rs:518:19:518:22 | SelfParam |  | main.rs:516:5:519:5 | Self [trait FirstTrait] |
-| main.rs:523:19:523:22 | SelfParam |  | main.rs:521:5:524:5 | Self [trait SecondTrait] |
-| main.rs:526:64:526:64 | x |  | main.rs:526:45:526:61 | T |
-| main.rs:528:13:528:14 | s1 |  | main.rs:526:35:526:42 | I |
-| main.rs:528:18:528:18 | x |  | main.rs:526:45:526:61 | T |
-| main.rs:528:18:528:27 | x.method() |  | main.rs:526:35:526:42 | I |
-| main.rs:529:18:529:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:529:18:529:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:529:18:529:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:529:18:529:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:529:26:529:27 | s1 |  | main.rs:526:35:526:42 | I |
-| main.rs:532:65:532:65 | x |  | main.rs:532:46:532:62 | T |
-| main.rs:534:13:534:14 | s2 |  | main.rs:532:36:532:43 | I |
-| main.rs:534:18:534:18 | x |  | main.rs:532:46:532:62 | T |
-| main.rs:534:18:534:27 | x.method() |  | main.rs:532:36:532:43 | I |
-| main.rs:535:18:535:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:535:18:535:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:535:18:535:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:535:18:535:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:535:26:535:27 | s2 |  | main.rs:532:36:532:43 | I |
-| main.rs:538:49:538:49 | x |  | main.rs:538:30:538:46 | T |
-| main.rs:539:13:539:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:539:17:539:17 | x |  | main.rs:538:30:538:46 | T |
-| main.rs:539:17:539:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
+| main.rs:130:25:130:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:130:25:130:29 | SelfParam | &T | main.rs:128:9:133:9 | Self [trait Foo] |
+| main.rs:131:26:131:31 | "foo!\\n" |  | file://:0:0:0:0 | & |
+| main.rs:131:26:131:31 | "foo!\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:131:26:131:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:131:26:131:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:137:25:137:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:137:25:137:29 | SelfParam | &T | main.rs:135:9:140:9 | Self [trait Bar] |
+| main.rs:138:26:138:31 | "bar!\\n" |  | file://:0:0:0:0 | & |
+| main.rs:138:26:138:31 | "bar!\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:138:26:138:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:138:26:138:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:150:13:150:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:150:17:150:17 | X |  | main.rs:142:9:142:21 | X |
+| main.rs:153:13:153:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:157:13:157:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:161:13:161:13 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:167:27:167:28 | &x |  | file://:0:0:0:0 | & |
+| main.rs:167:27:167:28 | &x | &T | main.rs:142:9:142:21 | X |
+| main.rs:167:28:167:28 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:168:27:168:28 | &x |  | file://:0:0:0:0 | & |
+| main.rs:168:27:168:28 | &x | &T | main.rs:142:9:142:21 | X |
+| main.rs:168:28:168:28 | x |  | main.rs:142:9:142:21 | X |
+| main.rs:186:15:186:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:186:15:186:18 | SelfParam | A | main.rs:179:5:180:14 | S1 |
+| main.rs:186:27:188:9 | { ... } |  | main.rs:179:5:180:14 | S1 |
+| main.rs:187:13:187:16 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:187:13:187:16 | self | A | main.rs:179:5:180:14 | S1 |
+| main.rs:187:13:187:18 | self.a |  | main.rs:179:5:180:14 | S1 |
+| main.rs:193:15:193:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:193:15:193:18 | SelfParam | A | main.rs:181:5:182:14 | S2 |
+| main.rs:193:29:195:9 | { ... } |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:193:29:195:9 | { ... } | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:13:194:30 | Self {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:194:13:194:30 | Self {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:23:194:26 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:194:23:194:26 | self | A | main.rs:181:5:182:14 | S2 |
+| main.rs:194:23:194:28 | self.a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:199:15:199:18 | SelfParam |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:199:15:199:18 | SelfParam | A | main.rs:198:10:198:10 | T |
+| main.rs:199:26:201:9 | { ... } |  | main.rs:198:10:198:10 | T |
+| main.rs:200:13:200:16 | self |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:200:13:200:16 | self | A | main.rs:198:10:198:10 | T |
+| main.rs:200:13:200:18 | self.a |  | main.rs:198:10:198:10 | T |
+| main.rs:205:13:205:13 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:205:13:205:13 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:205:17:205:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:205:17:205:33 | MyThing {...} | A | main.rs:179:5:180:14 | S1 |
+| main.rs:205:30:205:31 | S1 |  | main.rs:179:5:180:14 | S1 |
+| main.rs:206:13:206:13 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:206:13:206:13 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:206:17:206:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:206:17:206:33 | MyThing {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:206:30:206:31 | S2 |  | main.rs:181:5:182:14 | S2 |
+| main.rs:209:18:209:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:209:18:209:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:209:18:209:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:209:18:209:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:209:26:209:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:209:26:209:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:209:26:209:28 | x.a |  | main.rs:179:5:180:14 | S1 |
+| main.rs:210:18:210:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:210:18:210:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:210:18:210:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:210:18:210:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:210:26:210:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:210:26:210:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:210:26:210:28 | y.a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:212:18:212:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:212:18:212:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:212:18:212:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:212:18:212:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:212:26:212:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:212:26:212:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:212:26:212:31 | x.m1() |  | main.rs:179:5:180:14 | S1 |
+| main.rs:213:18:213:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:213:18:213:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:213:18:213:33 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:213:18:213:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:213:26:213:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:213:26:213:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:213:26:213:31 | y.m1() |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:213:26:213:31 | y.m1() | A | main.rs:181:5:182:14 | S2 |
+| main.rs:213:26:213:33 | ... .a |  | main.rs:181:5:182:14 | S2 |
+| main.rs:215:13:215:13 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:215:13:215:13 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:215:17:215:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:215:17:215:33 | MyThing {...} | A | main.rs:179:5:180:14 | S1 |
+| main.rs:215:30:215:31 | S1 |  | main.rs:179:5:180:14 | S1 |
+| main.rs:216:13:216:13 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:216:13:216:13 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:216:17:216:33 | MyThing {...} |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:216:17:216:33 | MyThing {...} | A | main.rs:181:5:182:14 | S2 |
+| main.rs:216:30:216:31 | S2 |  | main.rs:181:5:182:14 | S2 |
+| main.rs:218:18:218:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:218:18:218:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:218:18:218:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:218:18:218:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:218:26:218:26 | x |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:218:26:218:26 | x | A | main.rs:179:5:180:14 | S1 |
+| main.rs:218:26:218:31 | x.m2() |  | main.rs:179:5:180:14 | S1 |
+| main.rs:219:18:219:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:219:18:219:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:219:18:219:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:219:18:219:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:219:26:219:26 | y |  | main.rs:174:5:177:5 | MyThing |
+| main.rs:219:26:219:26 | y | A | main.rs:181:5:182:14 | S2 |
+| main.rs:219:26:219:31 | y.m2() |  | main.rs:181:5:182:14 | S2 |
+| main.rs:243:15:243:18 | SelfParam |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:245:15:245:18 | SelfParam |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:248:9:250:9 | { ... } |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:249:13:249:16 | self |  | main.rs:242:5:251:5 | Self [trait MyTrait] |
+| main.rs:255:16:255:19 | SelfParam |  | main.rs:253:5:258:5 | Self [trait MyProduct] |
+| main.rs:257:16:257:19 | SelfParam |  | main.rs:253:5:258:5 | Self [trait MyProduct] |
+| main.rs:260:43:260:43 | x |  | main.rs:260:26:260:40 | T2 |
+| main.rs:260:56:262:5 | { ... } |  | main.rs:260:22:260:23 | T1 |
+| main.rs:261:9:261:9 | x |  | main.rs:260:26:260:40 | T2 |
+| main.rs:261:9:261:14 | x.m1() |  | main.rs:260:22:260:23 | T1 |
+| main.rs:266:15:266:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:266:15:266:18 | SelfParam | A | main.rs:235:5:236:14 | S1 |
+| main.rs:266:27:268:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:267:13:267:16 | self |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:267:13:267:16 | self | A | main.rs:235:5:236:14 | S1 |
+| main.rs:267:13:267:18 | self.a |  | main.rs:235:5:236:14 | S1 |
+| main.rs:273:15:273:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:273:15:273:18 | SelfParam | A | main.rs:237:5:238:14 | S2 |
+| main.rs:273:29:275:9 | { ... } |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:273:29:275:9 | { ... } | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:13:274:30 | Self {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:274:13:274:30 | Self {...} | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:23:274:26 | self |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:274:23:274:26 | self | A | main.rs:237:5:238:14 | S2 |
+| main.rs:274:23:274:28 | self.a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:285:15:285:18 | SelfParam |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:285:15:285:18 | SelfParam | A | main.rs:239:5:240:14 | S3 |
+| main.rs:285:27:287:9 | { ... } |  | main.rs:280:10:280:11 | TD |
+| main.rs:286:13:286:25 | ...::default(...) |  | main.rs:280:10:280:11 | TD |
+| main.rs:292:15:292:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:292:15:292:18 | SelfParam | P1 | main.rs:290:10:290:10 | I |
+| main.rs:292:15:292:18 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:292:26:294:9 | { ... } |  | main.rs:290:10:290:10 | I |
+| main.rs:293:13:293:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:293:13:293:16 | self | P1 | main.rs:290:10:290:10 | I |
+| main.rs:293:13:293:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:293:13:293:19 | self.p1 |  | main.rs:290:10:290:10 | I |
+| main.rs:299:15:299:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:299:15:299:18 | SelfParam | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:299:15:299:18 | SelfParam | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:299:27:301:9 | { ... } |  | main.rs:239:5:240:14 | S3 |
+| main.rs:300:13:300:14 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:306:15:306:18 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:306:15:306:18 | SelfParam | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:306:15:306:18 | SelfParam | P1.A | main.rs:304:10:304:11 | TT |
+| main.rs:306:15:306:18 | SelfParam | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:306:27:309:9 | { ... } |  | main.rs:304:10:304:11 | TT |
+| main.rs:307:17:307:21 | alpha |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:17:307:21 | alpha | A | main.rs:304:10:304:11 | TT |
+| main.rs:307:25:307:28 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:307:25:307:28 | self | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:25:307:28 | self | P1.A | main.rs:304:10:304:11 | TT |
+| main.rs:307:25:307:28 | self | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:307:25:307:31 | self.p1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:307:25:307:31 | self.p1 | A | main.rs:304:10:304:11 | TT |
+| main.rs:308:13:308:17 | alpha |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:308:13:308:17 | alpha | A | main.rs:304:10:304:11 | TT |
+| main.rs:308:13:308:19 | alpha.a |  | main.rs:304:10:304:11 | TT |
+| main.rs:315:16:315:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:315:16:315:19 | SelfParam | P1 | main.rs:313:10:313:10 | A |
+| main.rs:315:16:315:19 | SelfParam | P2 | main.rs:313:10:313:10 | A |
+| main.rs:315:27:317:9 | { ... } |  | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:316:13:316:16 | self | P1 | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:16 | self | P2 | main.rs:313:10:313:10 | A |
+| main.rs:316:13:316:19 | self.p1 |  | main.rs:313:10:313:10 | A |
+| main.rs:320:16:320:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:320:16:320:19 | SelfParam | P1 | main.rs:313:10:313:10 | A |
+| main.rs:320:16:320:19 | SelfParam | P2 | main.rs:313:10:313:10 | A |
+| main.rs:320:27:322:9 | { ... } |  | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:321:13:321:16 | self | P1 | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:16 | self | P2 | main.rs:313:10:313:10 | A |
+| main.rs:321:13:321:19 | self.p2 |  | main.rs:313:10:313:10 | A |
+| main.rs:328:16:328:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:328:16:328:19 | SelfParam | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:328:16:328:19 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:328:28:330:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:329:13:329:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:329:13:329:16 | self | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:329:13:329:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:329:13:329:19 | self.p2 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:333:16:333:19 | SelfParam |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:333:16:333:19 | SelfParam | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:333:16:333:19 | SelfParam | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:333:28:335:9 | { ... } |  | main.rs:237:5:238:14 | S2 |
+| main.rs:334:13:334:16 | self |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:334:13:334:16 | self | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:334:13:334:16 | self | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:334:13:334:19 | self.p1 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:338:46:338:46 | p |  | main.rs:338:24:338:43 | P |
+| main.rs:338:58:340:5 | { ... } |  | main.rs:338:16:338:17 | V1 |
+| main.rs:339:9:339:9 | p |  | main.rs:338:24:338:43 | P |
+| main.rs:339:9:339:15 | p.fst() |  | main.rs:338:16:338:17 | V1 |
+| main.rs:342:46:342:46 | p |  | main.rs:342:24:342:43 | P |
+| main.rs:342:58:344:5 | { ... } |  | main.rs:342:20:342:21 | V2 |
+| main.rs:343:9:343:9 | p |  | main.rs:342:24:342:43 | P |
+| main.rs:343:9:343:15 | p.snd() |  | main.rs:342:20:342:21 | V2 |
+| main.rs:346:54:346:54 | p |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:346:54:346:54 | p | P1 | main.rs:346:20:346:21 | V0 |
+| main.rs:346:54:346:54 | p | P2 | main.rs:346:32:346:51 | P |
+| main.rs:346:78:348:5 | { ... } |  | main.rs:346:24:346:25 | V1 |
+| main.rs:347:9:347:9 | p |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:347:9:347:9 | p | P1 | main.rs:346:20:346:21 | V0 |
+| main.rs:347:9:347:9 | p | P2 | main.rs:346:32:346:51 | P |
+| main.rs:347:9:347:12 | p.p2 |  | main.rs:346:32:346:51 | P |
+| main.rs:347:9:347:18 | ... .fst() |  | main.rs:346:24:346:25 | V1 |
+| main.rs:352:23:352:26 | SelfParam |  | main.rs:350:5:353:5 | Self [trait ConvertTo] |
+| main.rs:357:23:357:26 | SelfParam |  | main.rs:355:10:355:23 | T |
+| main.rs:357:35:359:9 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:358:13:358:16 | self |  | main.rs:355:10:355:23 | T |
+| main.rs:358:13:358:21 | self.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:362:41:362:45 | thing |  | main.rs:362:23:362:38 | T |
+| main.rs:362:57:364:5 | { ... } |  | main.rs:362:19:362:20 | TS |
+| main.rs:363:9:363:13 | thing |  | main.rs:362:23:362:38 | T |
+| main.rs:363:9:363:26 | thing.convert_to() |  | main.rs:362:19:362:20 | TS |
+| main.rs:366:56:366:60 | thing |  | main.rs:366:39:366:53 | TP |
+| main.rs:366:73:369:5 | { ... } |  | main.rs:235:5:236:14 | S1 |
+| main.rs:368:9:368:13 | thing |  | main.rs:366:39:366:53 | TP |
+| main.rs:368:9:368:26 | thing.convert_to() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:372:13:372:20 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:372:13:372:20 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:372:24:372:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:372:24:372:40 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:372:37:372:38 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:373:13:373:20 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:373:13:373:20 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:373:24:373:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:373:24:373:40 | MyThing {...} | A | main.rs:237:5:238:14 | S2 |
+| main.rs:373:37:373:38 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:374:13:374:20 | thing_s3 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:374:13:374:20 | thing_s3 | A | main.rs:239:5:240:14 | S3 |
+| main.rs:374:24:374:40 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:374:24:374:40 | MyThing {...} | A | main.rs:239:5:240:14 | S3 |
+| main.rs:374:37:374:38 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:378:18:378:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:378:18:378:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:378:18:378:38 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:378:18:378:38 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:378:26:378:33 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:378:26:378:33 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:378:26:378:38 | thing_s1.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:379:18:379:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:379:18:379:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:379:18:379:40 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:379:18:379:40 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:379:26:379:33 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:379:26:379:33 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:379:26:379:38 | thing_s2.m1() |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:379:26:379:38 | thing_s2.m1() | A | main.rs:237:5:238:14 | S2 |
+| main.rs:379:26:379:40 | ... .a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:380:13:380:14 | s3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:380:22:380:29 | thing_s3 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:380:22:380:29 | thing_s3 | A | main.rs:239:5:240:14 | S3 |
+| main.rs:380:22:380:34 | thing_s3.m1() |  | main.rs:239:5:240:14 | S3 |
+| main.rs:381:18:381:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:381:18:381:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:381:18:381:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:381:18:381:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:381:26:381:27 | s3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:383:13:383:14 | p1 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:383:13:383:14 | p1 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:13:383:14 | p1 | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:18:383:42 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:383:18:383:42 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:18:383:42 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:383:31:383:32 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:383:39:383:40 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:384:18:384:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:384:18:384:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:384:18:384:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:384:18:384:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:384:26:384:27 | p1 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:384:26:384:27 | p1 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:384:26:384:27 | p1 | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:384:26:384:32 | p1.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:386:13:386:14 | p2 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:386:13:386:14 | p2 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:386:13:386:14 | p2 | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:386:18:386:42 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:386:18:386:42 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:386:18:386:42 | MyPair {...} | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:386:31:386:32 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:386:39:386:40 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:387:18:387:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:387:18:387:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:387:18:387:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:387:18:387:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:387:26:387:27 | p2 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:387:26:387:27 | p2 | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:387:26:387:27 | p2 | P2 | main.rs:237:5:238:14 | S2 |
+| main.rs:387:26:387:32 | p2.m1() |  | main.rs:239:5:240:14 | S3 |
+| main.rs:389:13:389:14 | p3 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:389:13:389:14 | p3 | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:389:13:389:14 | p3 | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:389:13:389:14 | p3 | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:389:18:392:9 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:389:18:392:9 | MyPair {...} | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:389:18:392:9 | MyPair {...} | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:389:18:392:9 | MyPair {...} | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:390:17:390:33 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:390:17:390:33 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:390:30:390:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:391:17:391:18 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:393:18:393:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:393:18:393:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:393:18:393:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:393:18:393:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:393:26:393:27 | p3 |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:393:26:393:27 | p3 | P1 | main.rs:224:5:227:5 | MyThing |
+| main.rs:393:26:393:27 | p3 | P1.A | main.rs:235:5:236:14 | S1 |
+| main.rs:393:26:393:27 | p3 | P2 | main.rs:239:5:240:14 | S3 |
+| main.rs:393:26:393:32 | p3.m1() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:396:13:396:13 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:396:13:396:13 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:13:396:13 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:17:396:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:396:17:396:41 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:17:396:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:396:30:396:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:396:38:396:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:397:13:397:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:17 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:397:17:397:17 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:17 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:397:17:397:23 | a.fst() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:398:18:398:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:398:18:398:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:398:18:398:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:398:18:398:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:398:26:398:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:399:13:399:13 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:17 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:399:17:399:17 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:17 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:399:17:399:23 | a.snd() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:400:18:400:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:400:18:400:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:400:18:400:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:400:18:400:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:400:26:400:26 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:406:13:406:13 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:406:13:406:13 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:406:13:406:13 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:406:17:406:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:406:17:406:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:406:17:406:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:406:30:406:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:406:38:406:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:407:13:407:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:407:17:407:17 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:407:17:407:17 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:407:17:407:17 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:407:17:407:23 | b.fst() |  | main.rs:235:5:236:14 | S1 |
+| main.rs:408:18:408:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:408:18:408:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:408:18:408:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:408:18:408:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:408:26:408:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:409:13:409:13 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:409:17:409:17 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:409:17:409:17 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:409:17:409:17 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:409:17:409:23 | b.snd() |  | main.rs:237:5:238:14 | S2 |
+| main.rs:410:18:410:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:410:18:410:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:410:18:410:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:410:18:410:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:410:26:410:26 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:414:13:414:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:414:17:414:39 | call_trait_m1(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:414:31:414:38 | thing_s1 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:414:31:414:38 | thing_s1 | A | main.rs:235:5:236:14 | S1 |
+| main.rs:415:18:415:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:415:18:415:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:415:18:415:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:415:18:415:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:415:26:415:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:416:13:416:13 | y |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:13:416:13 | y | A | main.rs:237:5:238:14 | S2 |
+| main.rs:416:17:416:39 | call_trait_m1(...) |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:17:416:39 | call_trait_m1(...) | A | main.rs:237:5:238:14 | S2 |
+| main.rs:416:31:416:38 | thing_s2 |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:416:31:416:38 | thing_s2 | A | main.rs:237:5:238:14 | S2 |
+| main.rs:417:18:417:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:417:18:417:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:417:18:417:28 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:417:18:417:28 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:417:26:417:26 | y |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:417:26:417:26 | y | A | main.rs:237:5:238:14 | S2 |
+| main.rs:417:26:417:28 | y.a |  | main.rs:237:5:238:14 | S2 |
+| main.rs:420:13:420:13 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:420:13:420:13 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:13:420:13 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:17:420:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:420:17:420:41 | MyPair {...} | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:17:420:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:420:30:420:31 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:420:38:420:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:13:421:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:17:421:26 | get_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:421:25:421:25 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:421:25:421:25 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:421:25:421:25 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:422:18:422:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:422:18:422:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:422:18:422:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:422:18:422:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:422:26:422:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:13:423:13 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:17:423:26 | get_snd(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:423:25:423:25 | a |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:423:25:423:25 | a | P1 | main.rs:235:5:236:14 | S1 |
+| main.rs:423:25:423:25 | a | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:424:18:424:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:424:18:424:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:424:18:424:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:424:18:424:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:424:26:424:26 | y |  | main.rs:235:5:236:14 | S1 |
+| main.rs:427:13:427:13 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:427:13:427:13 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:427:13:427:13 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:427:17:427:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:427:17:427:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:427:17:427:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:427:30:427:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:427:38:427:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:13:428:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:17:428:26 | get_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:428:25:428:25 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:428:25:428:25 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:428:25:428:25 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:429:18:429:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:429:18:429:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:429:18:429:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:429:18:429:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:429:26:429:26 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:430:13:430:13 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:430:17:430:26 | get_snd(...) |  | main.rs:237:5:238:14 | S2 |
+| main.rs:430:25:430:25 | b |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:430:25:430:25 | b | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:430:25:430:25 | b | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:431:18:431:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:431:18:431:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:431:18:431:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:431:18:431:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:431:26:431:26 | y |  | main.rs:237:5:238:14 | S2 |
+| main.rs:433:13:433:13 | c |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:13:433:13 | c | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:433:13:433:13 | c | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:13:433:13 | c | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:433:13:433:13 | c | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:433:17:436:9 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:17:436:9 | MyPair {...} | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:433:17:436:9 | MyPair {...} | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:433:17:436:9 | MyPair {...} | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:433:17:436:9 | MyPair {...} | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:434:17:434:18 | S3 |  | main.rs:239:5:240:14 | S3 |
+| main.rs:435:17:435:41 | MyPair {...} |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:435:17:435:41 | MyPair {...} | P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:435:17:435:41 | MyPair {...} | P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:435:30:435:31 | S2 |  | main.rs:237:5:238:14 | S2 |
+| main.rs:435:38:435:39 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:13:437:13 | x |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:17:437:30 | get_snd_fst(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:437:29:437:29 | c |  | main.rs:229:5:233:5 | MyPair |
+| main.rs:437:29:437:29 | c | P1 | main.rs:239:5:240:14 | S3 |
+| main.rs:437:29:437:29 | c | P2 | main.rs:229:5:233:5 | MyPair |
+| main.rs:437:29:437:29 | c | P2.P1 | main.rs:237:5:238:14 | S2 |
+| main.rs:437:29:437:29 | c | P2.P2 | main.rs:235:5:236:14 | S1 |
+| main.rs:439:13:439:17 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:439:13:439:17 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:439:21:439:37 | MyThing {...} |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:439:21:439:37 | MyThing {...} | A | main.rs:235:5:236:14 | S1 |
+| main.rs:439:34:439:35 | S1 |  | main.rs:235:5:236:14 | S1 |
+| main.rs:440:17:440:21 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:440:17:440:21 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:441:13:441:13 | j |  | main.rs:235:5:236:14 | S1 |
+| main.rs:441:17:441:33 | convert_to(...) |  | main.rs:235:5:236:14 | S1 |
+| main.rs:441:28:441:32 | thing |  | main.rs:224:5:227:5 | MyThing |
+| main.rs:441:28:441:32 | thing | A | main.rs:235:5:236:14 | S1 |
+| main.rs:450:26:450:29 | SelfParam |  | main.rs:449:5:453:5 | Self [trait OverlappingTrait] |
+| main.rs:452:28:452:31 | SelfParam |  | main.rs:449:5:453:5 | Self [trait OverlappingTrait] |
+| main.rs:452:34:452:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:457:26:457:29 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:457:38:459:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:458:13:458:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:28:462:31 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:34:462:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:462:48:464:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:463:13:463:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:469:26:469:29 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:469:38:471:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:470:13:470:16 | self |  | main.rs:446:5:447:14 | S1 |
+| main.rs:474:28:474:31 | SelfParam |  | main.rs:446:5:447:14 | S1 |
+| main.rs:474:40:476:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:475:13:475:16 | self |  | main.rs:446:5:447:14 | S1 |
+| main.rs:483:26:483:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:483:26:483:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:483:38:485:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:484:13:484:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:488:28:488:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:488:28:488:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:488:40:490:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:489:13:489:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:495:26:495:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:495:26:495:29 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:495:38:497:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:496:13:496:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:500:28:500:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:500:28:500:31 | SelfParam | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:500:34:500:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:500:48:502:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:501:13:501:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:507:26:507:29 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:507:26:507:29 | SelfParam | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:507:38:509:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:508:13:508:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:512:28:512:31 | SelfParam |  | main.rs:479:5:479:22 | S2 |
+| main.rs:512:28:512:31 | SelfParam | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:512:34:512:35 | s1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:512:48:514:9 | { ... } |  | main.rs:446:5:447:14 | S1 |
+| main.rs:513:13:513:14 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:521:14:521:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:521:14:521:18 | SelfParam | &T | main.rs:520:5:522:5 | Self [trait OverlappingTrait2] |
+| main.rs:521:21:521:21 | x |  | file://:0:0:0:0 | & |
+| main.rs:521:21:521:21 | x | &T | main.rs:520:29:520:29 | T |
+| main.rs:526:14:526:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:526:14:526:18 | SelfParam | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:526:14:526:18 | SelfParam | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:526:21:526:21 | x |  | file://:0:0:0:0 | & |
+| main.rs:526:21:526:21 | x | &T | main.rs:524:10:524:10 | T |
+| main.rs:526:37:528:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:526:37:528:9 | { ... } | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:526:37:528:9 | { ... } | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:527:13:527:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:527:13:527:16 | self | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:527:13:527:16 | self | &T.T3 | main.rs:524:10:524:10 | T |
+| main.rs:533:14:533:18 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:533:14:533:18 | SelfParam | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:533:14:533:18 | SelfParam | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:533:21:533:21 | x |  | main.rs:531:10:531:10 | T |
+| main.rs:533:36:535:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:533:36:535:9 | { ... } | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:533:36:535:9 | { ... } | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:534:13:534:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:534:13:534:16 | self | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:534:13:534:16 | self | &T.T3 | main.rs:531:10:531:10 | T |
+| main.rs:539:13:539:13 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:539:17:539:18 | S1 |  | main.rs:446:5:447:14 | S1 |
 | main.rs:540:18:540:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:540:18:540:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:540:18:540:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:540:18:540:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:540:26:540:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:543:53:543:53 | x |  | main.rs:543:34:543:50 | T |
-| main.rs:544:13:544:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:544:17:544:17 | x |  | main.rs:543:34:543:50 | T |
-| main.rs:544:17:544:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:545:18:545:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:545:18:545:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:545:18:545:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:545:18:545:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:545:26:545:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:548:43:548:43 | x |  | main.rs:548:40:548:40 | T |
-| main.rs:552:13:552:13 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:552:17:552:17 | x |  | main.rs:548:40:548:40 | T |
-| main.rs:552:17:552:26 | x.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:553:18:553:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:553:18:553:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:553:18:553:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:553:18:553:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:553:26:553:26 | s |  | main.rs:508:5:509:14 | S1 |
-| main.rs:557:16:557:19 | SelfParam |  | main.rs:556:5:560:5 | Self [trait Pair] |
-| main.rs:559:16:559:19 | SelfParam |  | main.rs:556:5:560:5 | Self [trait Pair] |
-| main.rs:562:53:562:53 | x |  | main.rs:562:50:562:50 | T |
-| main.rs:562:59:562:59 | y |  | main.rs:562:50:562:50 | T |
-| main.rs:567:13:567:13 | _ |  | main.rs:508:5:509:14 | S1 |
-| main.rs:567:17:567:17 | x |  | main.rs:562:50:562:50 | T |
-| main.rs:567:17:567:23 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:568:13:568:13 | _ |  | main.rs:508:5:509:14 | S1 |
-| main.rs:568:17:568:17 | y |  | main.rs:562:50:562:50 | T |
-| main.rs:568:17:568:26 | y.method() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:571:58:571:58 | x |  | main.rs:571:41:571:55 | T |
-| main.rs:571:64:571:64 | y |  | main.rs:571:41:571:55 | T |
-| main.rs:573:13:573:14 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:573:18:573:18 | x |  | main.rs:571:41:571:55 | T |
-| main.rs:573:18:573:24 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:574:13:574:14 | s2 |  | main.rs:511:5:512:14 | S2 |
-| main.rs:574:18:574:18 | y |  | main.rs:571:41:571:55 | T |
-| main.rs:574:18:574:24 | y.snd() |  | main.rs:511:5:512:14 | S2 |
-| main.rs:575:18:575:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:575:18:575:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:575:18:575:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:575:18:575:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:575:32:575:33 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:575:36:575:37 | s2 |  | main.rs:511:5:512:14 | S2 |
-| main.rs:578:69:578:69 | x |  | main.rs:578:52:578:66 | T |
-| main.rs:578:75:578:75 | y |  | main.rs:578:52:578:66 | T |
-| main.rs:580:13:580:14 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:580:18:580:18 | x |  | main.rs:578:52:578:66 | T |
-| main.rs:580:18:580:24 | x.fst() |  | main.rs:508:5:509:14 | S1 |
-| main.rs:581:13:581:14 | s2 |  | main.rs:578:41:578:49 | T2 |
-| main.rs:581:18:581:18 | y |  | main.rs:578:52:578:66 | T |
-| main.rs:581:18:581:24 | y.snd() |  | main.rs:578:41:578:49 | T2 |
-| main.rs:582:18:582:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:582:18:582:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:582:18:582:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:582:18:582:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:582:32:582:33 | s1 |  | main.rs:508:5:509:14 | S1 |
-| main.rs:582:36:582:37 | s2 |  | main.rs:578:41:578:49 | T2 |
-| main.rs:585:50:585:50 | x |  | main.rs:585:41:585:47 | T |
-| main.rs:585:56:585:56 | y |  | main.rs:585:41:585:47 | T |
-| main.rs:587:13:587:14 | s1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:587:18:587:18 | x |  | main.rs:585:41:585:47 | T |
-| main.rs:587:18:587:24 | x.fst() |  | {EXTERNAL LOCATION} | bool |
-| main.rs:588:13:588:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:588:18:588:18 | y |  | main.rs:585:41:585:47 | T |
-| main.rs:588:18:588:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:589:18:589:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:589:18:589:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:589:18:589:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:589:18:589:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:589:32:589:33 | s1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:589:36:589:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:592:54:592:54 | x |  | main.rs:592:41:592:51 | T |
-| main.rs:592:60:592:60 | y |  | main.rs:592:41:592:51 | T |
-| main.rs:594:13:594:14 | s1 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:594:18:594:18 | x |  | main.rs:592:41:592:51 | T |
-| main.rs:594:18:594:24 | x.fst() |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:595:13:595:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:595:18:595:18 | y |  | main.rs:592:41:592:51 | T |
-| main.rs:595:18:595:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:596:18:596:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:596:18:596:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:596:18:596:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:596:18:596:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:596:32:596:33 | s1 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:596:36:596:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:612:15:612:18 | SelfParam |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:614:15:614:18 | SelfParam |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:617:9:619:9 | { ... } |  | main.rs:611:19:611:19 | A |
-| main.rs:618:13:618:16 | self |  | main.rs:611:5:620:5 | Self [trait MyTrait] |
-| main.rs:618:13:618:21 | self.m1() |  | main.rs:611:19:611:19 | A |
-| main.rs:624:43:624:43 | x |  | main.rs:624:26:624:40 | T2 |
-| main.rs:624:56:626:5 | { ... } |  | main.rs:624:22:624:23 | T1 |
-| main.rs:625:9:625:9 | x |  | main.rs:624:26:624:40 | T2 |
-| main.rs:625:9:625:14 | x.m1() |  | main.rs:624:22:624:23 | T1 |
-| main.rs:630:49:630:49 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:630:49:630:49 | x | T | main.rs:630:32:630:46 | T2 |
-| main.rs:630:71:632:5 | { ... } |  | main.rs:630:28:630:29 | T1 |
-| main.rs:631:9:631:9 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:631:9:631:9 | x | T | main.rs:630:32:630:46 | T2 |
-| main.rs:631:9:631:11 | x.a |  | main.rs:630:32:630:46 | T2 |
-| main.rs:631:9:631:16 | ... .m1() |  | main.rs:630:28:630:29 | T1 |
-| main.rs:635:15:635:18 | SelfParam |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:635:15:635:18 | SelfParam | T | main.rs:634:10:634:10 | T |
-| main.rs:635:26:637:9 | { ... } |  | main.rs:634:10:634:10 | T |
-| main.rs:636:13:636:16 | self |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:636:13:636:16 | self | T | main.rs:634:10:634:10 | T |
-| main.rs:636:13:636:18 | self.a |  | main.rs:634:10:634:10 | T |
-| main.rs:641:13:641:13 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:641:13:641:13 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:641:17:641:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:641:17:641:33 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:641:30:641:31 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:642:13:642:13 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:642:13:642:13 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:642:17:642:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:642:17:642:33 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:642:30:642:31 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:644:18:644:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:644:18:644:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:644:18:644:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:644:18:644:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:644:26:644:26 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:644:26:644:26 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:644:26:644:31 | x.m1() |  | main.rs:606:5:607:14 | S1 |
-| main.rs:645:18:645:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:645:18:645:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:645:18:645:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:645:18:645:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:645:26:645:26 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:645:26:645:26 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:645:26:645:31 | y.m1() |  | main.rs:608:5:609:14 | S2 |
-| main.rs:647:13:647:13 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:647:13:647:13 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:647:17:647:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:647:17:647:33 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:647:30:647:31 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:648:13:648:13 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:648:13:648:13 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:648:17:648:33 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:648:17:648:33 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:648:30:648:31 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:650:18:650:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:650:18:650:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:650:18:650:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:650:18:650:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:650:26:650:26 | x |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:650:26:650:26 | x | T | main.rs:606:5:607:14 | S1 |
-| main.rs:650:26:650:31 | x.m2() |  | main.rs:606:5:607:14 | S1 |
-| main.rs:651:18:651:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:651:18:651:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:651:18:651:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:651:18:651:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:651:26:651:26 | y |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:651:26:651:26 | y | T | main.rs:608:5:609:14 | S2 |
-| main.rs:651:26:651:31 | y.m2() |  | main.rs:608:5:609:14 | S2 |
-| main.rs:653:13:653:14 | x2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:653:13:653:14 | x2 | T | main.rs:606:5:607:14 | S1 |
-| main.rs:653:18:653:34 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:653:18:653:34 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:653:31:653:32 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:654:13:654:14 | y2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:654:13:654:14 | y2 | T | main.rs:608:5:609:14 | S2 |
-| main.rs:654:18:654:34 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:654:18:654:34 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:654:31:654:32 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:656:18:656:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:656:18:656:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:656:18:656:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:656:18:656:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:656:26:656:42 | call_trait_m1(...) |  | main.rs:606:5:607:14 | S1 |
-| main.rs:656:40:656:41 | x2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:656:40:656:41 | x2 | T | main.rs:606:5:607:14 | S1 |
-| main.rs:657:18:657:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:657:18:657:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:657:18:657:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:657:18:657:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:657:26:657:42 | call_trait_m1(...) |  | main.rs:608:5:609:14 | S2 |
-| main.rs:657:40:657:41 | y2 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:657:40:657:41 | y2 | T | main.rs:608:5:609:14 | S2 |
-| main.rs:659:13:659:14 | x3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:13:659:14 | x3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:13:659:14 | x3 | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:659:18:661:9 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:18:661:9 | MyThing {...} | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:659:18:661:9 | MyThing {...} | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:660:16:660:32 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:660:16:660:32 | MyThing {...} | T | main.rs:606:5:607:14 | S1 |
-| main.rs:660:29:660:30 | S1 |  | main.rs:606:5:607:14 | S1 |
-| main.rs:662:13:662:14 | y3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:13:662:14 | y3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:13:662:14 | y3 | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:662:18:664:9 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:18:664:9 | MyThing {...} | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:662:18:664:9 | MyThing {...} | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:663:16:663:32 | MyThing {...} |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:663:16:663:32 | MyThing {...} | T | main.rs:608:5:609:14 | S2 |
-| main.rs:663:29:663:30 | S2 |  | main.rs:608:5:609:14 | S2 |
-| main.rs:666:13:666:13 | a |  | main.rs:606:5:607:14 | S1 |
-| main.rs:666:17:666:39 | call_trait_thing_m1(...) |  | main.rs:606:5:607:14 | S1 |
-| main.rs:666:37:666:38 | x3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:666:37:666:38 | x3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:666:37:666:38 | x3 | T.T | main.rs:606:5:607:14 | S1 |
-| main.rs:667:18:667:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:667:18:667:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:667:18:667:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:667:18:667:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:667:26:667:26 | a |  | main.rs:606:5:607:14 | S1 |
-| main.rs:668:13:668:13 | b |  | main.rs:608:5:609:14 | S2 |
-| main.rs:668:17:668:39 | call_trait_thing_m1(...) |  | main.rs:608:5:609:14 | S2 |
-| main.rs:668:37:668:38 | y3 |  | main.rs:601:5:604:5 | MyThing |
-| main.rs:668:37:668:38 | y3 | T | main.rs:601:5:604:5 | MyThing |
-| main.rs:668:37:668:38 | y3 | T.T | main.rs:608:5:609:14 | S2 |
-| main.rs:669:18:669:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:669:18:669:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:669:18:669:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:669:18:669:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:669:26:669:26 | b |  | main.rs:608:5:609:14 | S2 |
-| main.rs:680:19:680:22 | SelfParam |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:680:19:680:22 | SelfParam | A | main.rs:679:10:679:10 | A |
-| main.rs:680:30:682:9 | { ... } |  | main.rs:679:10:679:10 | A |
-| main.rs:681:13:681:16 | self |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:681:13:681:16 | self | A | main.rs:679:10:679:10 | A |
-| main.rs:681:13:681:22 | self.field |  | main.rs:679:10:679:10 | A |
-| main.rs:689:15:689:18 | SelfParam |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:691:15:691:18 | SelfParam |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:695:9:698:9 | { ... } |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:696:13:696:16 | self |  | main.rs:685:5:699:5 | Self [trait MyTrait] |
-| main.rs:696:13:696:21 | self.m1() |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:697:13:697:43 | ...::default(...) |  | main.rs:686:9:686:28 | AssociatedType |
-| main.rs:705:19:705:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:705:19:705:23 | SelfParam | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:705:26:705:26 | a |  | main.rs:705:16:705:16 | A |
-| main.rs:707:22:707:26 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:707:22:707:26 | SelfParam | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:707:29:707:29 | a |  | main.rs:707:19:707:19 | A |
-| main.rs:707:35:707:35 | b |  | main.rs:707:19:707:19 | A |
-| main.rs:707:75:710:9 | { ... } |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:708:13:708:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:708:13:708:16 | self | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:708:13:708:23 | self.put(...) |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:708:22:708:22 | a |  | main.rs:707:19:707:19 | A |
-| main.rs:709:13:709:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:709:13:709:16 | self | &T | main.rs:701:5:711:5 | Self [trait MyTraitAssoc2] |
-| main.rs:709:13:709:23 | self.put(...) |  | main.rs:702:9:702:52 | GenericAssociatedType |
-| main.rs:709:22:709:22 | b |  | main.rs:707:19:707:19 | A |
-| main.rs:718:21:718:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:718:21:718:25 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:720:20:720:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:720:20:720:24 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:722:20:722:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:722:20:722:24 | SelfParam | &T | main.rs:713:5:723:5 | Self [trait TraitMultipleAssoc] |
-| main.rs:738:15:738:18 | SelfParam |  | main.rs:725:5:726:13 | S |
-| main.rs:738:45:740:9 | { ... } |  | main.rs:731:5:732:14 | AT |
-| main.rs:739:13:739:14 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:748:19:748:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:748:19:748:23 | SelfParam | &T | main.rs:725:5:726:13 | S |
-| main.rs:748:26:748:26 | a |  | main.rs:748:16:748:16 | A |
-| main.rs:748:46:750:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:748:46:750:9 | { ... } | A | main.rs:748:16:748:16 | A |
-| main.rs:749:13:749:32 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:749:13:749:32 | Wrapper {...} | A | main.rs:748:16:748:16 | A |
-| main.rs:749:30:749:30 | a |  | main.rs:748:16:748:16 | A |
-| main.rs:757:15:757:18 | SelfParam |  | main.rs:728:5:729:14 | S2 |
-| main.rs:757:45:759:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:757:45:759:9 | { ... } | A | main.rs:728:5:729:14 | S2 |
-| main.rs:758:13:758:35 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:758:13:758:35 | Wrapper {...} | A | main.rs:728:5:729:14 | S2 |
-| main.rs:758:30:758:33 | self |  | main.rs:728:5:729:14 | S2 |
-| main.rs:764:30:766:9 | { ... } |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:764:30:766:9 | { ... } | A | main.rs:728:5:729:14 | S2 |
-| main.rs:765:13:765:33 | Wrapper {...} |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:765:13:765:33 | Wrapper {...} | A | main.rs:728:5:729:14 | S2 |
-| main.rs:765:30:765:31 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:771:22:771:26 | thing |  | main.rs:771:10:771:19 | T |
-| main.rs:772:9:772:13 | thing |  | main.rs:771:10:771:19 | T |
-| main.rs:779:21:779:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:779:21:779:25 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:779:34:781:9 | { ... } |  | main.rs:731:5:732:14 | AT |
-| main.rs:780:13:780:14 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:783:20:783:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:783:20:783:24 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:783:43:785:9 | { ... } |  | main.rs:725:5:726:13 | S |
-| main.rs:784:13:784:13 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:787:20:787:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:787:20:787:24 | SelfParam | &T | main.rs:731:5:732:14 | AT |
-| main.rs:787:43:789:9 | { ... } |  | main.rs:728:5:729:14 | S2 |
-| main.rs:788:13:788:14 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:793:13:793:14 | x1 |  | main.rs:725:5:726:13 | S |
-| main.rs:793:18:793:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:795:18:795:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:795:18:795:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:795:18:795:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:795:18:795:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:795:26:795:27 | x1 |  | main.rs:725:5:726:13 | S |
-| main.rs:795:26:795:32 | x1.m1() |  | main.rs:731:5:732:14 | AT |
-| main.rs:797:13:797:14 | x2 |  | main.rs:725:5:726:13 | S |
-| main.rs:797:18:797:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:799:13:799:13 | y |  | main.rs:731:5:732:14 | AT |
-| main.rs:799:17:799:18 | x2 |  | main.rs:725:5:726:13 | S |
-| main.rs:799:17:799:23 | x2.m2() |  | main.rs:731:5:732:14 | AT |
-| main.rs:800:18:800:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:800:18:800:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:800:18:800:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:800:18:800:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:800:26:800:26 | y |  | main.rs:731:5:732:14 | AT |
-| main.rs:802:13:802:14 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:802:18:802:18 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:804:18:804:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:804:18:804:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:804:18:804:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:804:18:804:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:804:26:804:27 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:804:26:804:34 | x3.put(...) |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:804:26:804:34 | x3.put(...) | A | {EXTERNAL LOCATION} | i32 |
-| main.rs:804:26:804:43 | ... .unwrap() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:804:33:804:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:807:18:807:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:807:18:807:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:807:18:807:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:807:18:807:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:807:26:807:27 | x3 |  | main.rs:725:5:726:13 | S |
-| main.rs:807:26:807:40 | x3.putTwo(...) |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:807:26:807:40 | x3.putTwo(...) | A | main.rs:745:36:745:50 | AssociatedParam |
-| main.rs:807:26:807:49 | ... .unwrap() |  | main.rs:745:36:745:50 | AssociatedParam |
-| main.rs:807:36:807:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:807:39:807:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:809:20:809:20 | S |  | main.rs:725:5:726:13 | S |
-| main.rs:810:18:810:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:810:18:810:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:810:18:810:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:810:18:810:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:812:13:812:14 | x5 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:812:18:812:19 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:813:18:813:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:813:18:813:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:813:18:813:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:813:18:813:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:813:26:813:27 | x5 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:813:26:813:32 | x5.m1() |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:813:26:813:32 | x5.m1() | A | main.rs:728:5:729:14 | S2 |
-| main.rs:814:13:814:14 | x6 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:814:18:814:19 | S2 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:815:18:815:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:815:18:815:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:815:18:815:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:815:18:815:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:815:26:815:27 | x6 |  | main.rs:728:5:729:14 | S2 |
-| main.rs:815:26:815:32 | x6.m2() |  | main.rs:674:5:677:5 | Wrapper |
-| main.rs:815:26:815:32 | x6.m2() | A | main.rs:728:5:729:14 | S2 |
-| main.rs:817:13:817:22 | assoc_zero |  | main.rs:731:5:732:14 | AT |
-| main.rs:817:26:817:27 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:817:26:817:38 | AT.get_zero() |  | main.rs:731:5:732:14 | AT |
-| main.rs:818:13:818:21 | assoc_one |  | main.rs:725:5:726:13 | S |
-| main.rs:818:25:818:26 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:818:25:818:36 | AT.get_one() |  | main.rs:725:5:726:13 | S |
-| main.rs:819:13:819:21 | assoc_two |  | main.rs:728:5:729:14 | S2 |
-| main.rs:819:25:819:26 | AT |  | main.rs:731:5:732:14 | AT |
-| main.rs:819:25:819:36 | AT.get_two() |  | main.rs:728:5:729:14 | S2 |
-| main.rs:827:19:827:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:827:19:827:23 | SelfParam | &T | main.rs:824:5:828:5 | Self [trait Supertrait] |
-| main.rs:827:26:827:32 | content |  | main.rs:825:9:825:21 | Content |
-| main.rs:832:24:832:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:832:24:832:28 | SelfParam | &T | main.rs:830:5:833:5 | Self [trait Subtrait] |
-| main.rs:841:23:841:27 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:841:23:841:27 | SelfParam | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:841:30:841:31 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:841:49:841:50 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:842:13:842:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:842:13:842:16 | self | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:842:25:842:26 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:843:13:843:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:843:13:843:16 | self | &T | main.rs:835:5:845:5 | Self [trait Subtrait2] |
-| main.rs:843:25:843:26 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:851:19:851:23 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:851:19:851:23 | SelfParam | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:851:19:851:23 | SelfParam | &T.T | main.rs:849:10:849:10 | T |
-| main.rs:851:26:851:33 | _content |  | main.rs:849:10:849:10 | T |
-| main.rs:852:22:852:42 | "Inserting content: \\n" |  | file://:0:0:0:0 | & |
-| main.rs:852:22:852:42 | "Inserting content: \\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:852:22:852:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:852:22:852:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:858:24:858:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:858:24:858:28 | SelfParam | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:858:24:858:28 | SelfParam | &T.T | main.rs:856:10:856:17 | T |
-| main.rs:858:48:860:9 | { ... } |  | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:19 | (...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:859:13:859:19 | (...) | T | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:21 | ... .0 |  | main.rs:856:10:856:17 | T |
-| main.rs:859:13:859:29 | ... .clone() |  | main.rs:856:10:856:17 | T |
-| main.rs:859:14:859:18 | * ... |  | main.rs:847:5:847:24 | MyType |
-| main.rs:859:14:859:18 | * ... | T | main.rs:856:10:856:17 | T |
-| main.rs:859:15:859:18 | self |  | file://:0:0:0:0 | & |
-| main.rs:859:15:859:18 | self | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:859:15:859:18 | self | &T.T | main.rs:856:10:856:17 | T |
-| main.rs:863:33:863:36 | item |  | file://:0:0:0:0 | & |
-| main.rs:863:33:863:36 | item | &T | main.rs:863:20:863:30 | T |
-| main.rs:863:57:865:5 | { ... } |  | main.rs:825:9:825:21 | Content |
-| main.rs:864:9:864:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:864:9:864:12 | item | &T | main.rs:863:20:863:30 | T |
-| main.rs:864:9:864:26 | item.get_content() |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:35:867:38 | item |  | file://:0:0:0:0 | & |
-| main.rs:867:35:867:38 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:867:45:867:46 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:61:867:62 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:867:77:867:78 | c3 |  | main.rs:825:9:825:21 | Content |
-| main.rs:868:9:868:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:868:9:868:12 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:868:21:868:22 | c1 |  | main.rs:825:9:825:21 | Content |
-| main.rs:869:9:869:12 | item |  | file://:0:0:0:0 | & |
-| main.rs:869:9:869:12 | item | &T | main.rs:867:21:867:32 | T |
-| main.rs:869:25:869:26 | c2 |  | main.rs:825:9:825:21 | Content |
-| main.rs:869:29:869:30 | c3 |  | main.rs:825:9:825:21 | Content |
-| main.rs:873:13:873:17 | item1 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:873:13:873:17 | item1 | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:873:21:873:33 | MyType(...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:873:21:873:33 | MyType(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:873:28:873:32 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:874:25:874:29 | item1 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:874:25:874:29 | item1 | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:876:13:876:17 | item2 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:876:13:876:17 | item2 | T | {EXTERNAL LOCATION} | bool |
-| main.rs:876:21:876:32 | MyType(...) |  | main.rs:847:5:847:24 | MyType |
-| main.rs:876:21:876:32 | MyType(...) | T | {EXTERNAL LOCATION} | bool |
-| main.rs:876:28:876:31 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:877:37:877:42 | &item2 |  | file://:0:0:0:0 | & |
-| main.rs:877:37:877:42 | &item2 | &T | main.rs:847:5:847:24 | MyType |
-| main.rs:877:37:877:42 | &item2 | &T.T | {EXTERNAL LOCATION} | bool |
-| main.rs:877:38:877:42 | item2 |  | main.rs:847:5:847:24 | MyType |
-| main.rs:877:38:877:42 | item2 | T | {EXTERNAL LOCATION} | bool |
-| main.rs:894:15:894:18 | SelfParam |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:894:15:894:18 | SelfParam | A | main.rs:893:10:893:10 | T |
-| main.rs:894:26:899:9 | { ... } |  | main.rs:893:10:893:10 | T |
-| main.rs:895:13:898:13 | match self { ... } |  | main.rs:893:10:893:10 | T |
-| main.rs:895:19:895:22 | self |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:895:19:895:22 | self | A | main.rs:893:10:893:10 | T |
-| main.rs:896:17:896:29 | ...::C1(...) |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:896:17:896:29 | ...::C1(...) | A | main.rs:893:10:893:10 | T |
-| main.rs:896:28:896:28 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:896:34:896:34 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:897:17:897:32 | ...::C2 {...} |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:897:17:897:32 | ...::C2 {...} | A | main.rs:893:10:893:10 | T |
-| main.rs:897:30:897:30 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:897:37:897:37 | a |  | main.rs:893:10:893:10 | T |
-| main.rs:903:13:903:13 | x |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:903:13:903:13 | x | A | main.rs:888:5:889:14 | S1 |
-| main.rs:903:17:903:30 | ...::C1(...) |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:903:17:903:30 | ...::C1(...) | A | main.rs:888:5:889:14 | S1 |
-| main.rs:903:28:903:29 | S1 |  | main.rs:888:5:889:14 | S1 |
-| main.rs:904:13:904:13 | y |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:904:13:904:13 | y | A | main.rs:890:5:891:14 | S2 |
-| main.rs:904:17:904:36 | ...::C2 {...} |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:904:17:904:36 | ...::C2 {...} | A | main.rs:890:5:891:14 | S2 |
-| main.rs:904:33:904:34 | S2 |  | main.rs:890:5:891:14 | S2 |
-| main.rs:906:18:906:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:906:18:906:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:906:18:906:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:906:18:906:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:906:26:906:26 | x |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:906:26:906:26 | x | A | main.rs:888:5:889:14 | S1 |
-| main.rs:906:26:906:31 | x.m1() |  | main.rs:888:5:889:14 | S1 |
-| main.rs:907:18:907:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:907:18:907:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:907:18:907:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:907:18:907:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:907:26:907:26 | y |  | main.rs:882:5:886:5 | MyEnum |
-| main.rs:907:26:907:26 | y | A | main.rs:890:5:891:14 | S2 |
-| main.rs:907:26:907:31 | y.m1() |  | main.rs:890:5:891:14 | S2 |
-| main.rs:929:15:929:18 | SelfParam |  | main.rs:927:5:930:5 | Self [trait MyTrait1] |
-| main.rs:934:15:934:18 | SelfParam |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:937:9:943:9 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:938:13:942:13 | if ... {...} else {...} |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:938:16:938:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:938:16:938:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:938:20:938:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:938:22:940:13 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:939:17:939:20 | self |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:939:17:939:25 | self.m1() |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:940:20:942:13 | { ... } |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:941:17:941:30 | ...::m1(...) |  | main.rs:932:20:932:22 | Tr2 |
-| main.rs:941:26:941:29 | self |  | main.rs:932:5:944:5 | Self [trait MyTrait2] |
-| main.rs:948:15:948:18 | SelfParam |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:951:9:957:9 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:952:13:956:13 | if ... {...} else {...} |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:952:16:952:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:952:16:952:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:952:20:952:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:952:22:954:13 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:953:17:953:20 | self |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:953:17:953:25 | self.m2() |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:953:17:953:25 | self.m2() | A | main.rs:946:20:946:22 | Tr3 |
-| main.rs:953:17:953:27 | ... .a |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:954:20:956:13 | { ... } |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:17:955:30 | ...::m2(...) |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:955:17:955:30 | ...::m2(...) | A | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:17:955:32 | ... .a |  | main.rs:946:20:946:22 | Tr3 |
-| main.rs:955:26:955:29 | self |  | main.rs:946:5:958:5 | Self [trait MyTrait3] |
-| main.rs:962:15:962:18 | SelfParam |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:962:15:962:18 | SelfParam | A | main.rs:960:10:960:10 | T |
-| main.rs:962:26:964:9 | { ... } |  | main.rs:960:10:960:10 | T |
-| main.rs:963:13:963:16 | self |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:963:13:963:16 | self | A | main.rs:960:10:960:10 | T |
-| main.rs:963:13:963:18 | self.a |  | main.rs:960:10:960:10 | T |
-| main.rs:971:15:971:18 | SelfParam |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:971:15:971:18 | SelfParam | A | main.rs:969:10:969:10 | T |
-| main.rs:971:35:973:9 | { ... } |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:971:35:973:9 | { ... } | A | main.rs:969:10:969:10 | T |
-| main.rs:972:13:972:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:972:13:972:33 | MyThing {...} | A | main.rs:969:10:969:10 | T |
-| main.rs:972:26:972:29 | self |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:972:26:972:29 | self | A | main.rs:969:10:969:10 | T |
-| main.rs:972:26:972:31 | self.a |  | main.rs:969:10:969:10 | T |
-| main.rs:980:44:980:44 | x |  | main.rs:980:26:980:41 | T2 |
-| main.rs:980:57:982:5 | { ... } |  | main.rs:980:22:980:23 | T1 |
-| main.rs:981:9:981:9 | x |  | main.rs:980:26:980:41 | T2 |
-| main.rs:981:9:981:14 | x.m1() |  | main.rs:980:22:980:23 | T1 |
-| main.rs:984:56:984:56 | x |  | main.rs:984:39:984:53 | T |
-| main.rs:986:13:986:13 | a |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:986:13:986:13 | a | A | main.rs:922:5:923:14 | S1 |
-| main.rs:986:17:986:17 | x |  | main.rs:984:39:984:53 | T |
-| main.rs:986:17:986:22 | x.m1() |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:986:17:986:22 | x.m1() | A | main.rs:922:5:923:14 | S1 |
-| main.rs:987:18:987:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:987:18:987:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:987:18:987:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:987:18:987:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:987:26:987:26 | a |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:987:26:987:26 | a | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:13:991:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:991:13:991:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:17:991:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:991:17:991:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:991:30:991:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:992:13:992:13 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:992:13:992:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:992:17:992:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:992:17:992:33 | MyThing {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:992:30:992:31 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:994:18:994:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:994:18:994:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:994:18:994:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:994:18:994:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:994:26:994:26 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:994:26:994:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:994:26:994:31 | x.m1() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:995:18:995:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:995:18:995:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:995:18:995:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:995:18:995:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:995:26:995:26 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:995:26:995:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:995:26:995:31 | y.m1() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:997:13:997:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:997:13:997:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:997:17:997:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:997:17:997:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:997:30:997:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:998:13:998:13 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:998:13:998:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:998:17:998:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:998:17:998:33 | MyThing {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:998:30:998:31 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1000:18:1000:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1000:18:1000:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1000:18:1000:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1000:18:1000:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1000:26:1000:26 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1000:26:1000:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1000:26:1000:31 | x.m2() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1001:18:1001:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1001:18:1001:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1001:18:1001:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1001:18:1001:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1001:26:1001:26 | y |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1001:26:1001:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1001:26:1001:31 | y.m2() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1003:13:1003:13 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1003:13:1003:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1003:17:1003:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1003:17:1003:34 | MyThing2 {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1003:31:1003:32 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1004:13:1004:13 | y |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1004:13:1004:13 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1004:17:1004:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1004:17:1004:34 | MyThing2 {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1004:31:1004:32 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1006:18:1006:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1006:18:1006:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1006:18:1006:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1006:18:1006:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1006:26:1006:26 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1006:26:1006:26 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1006:26:1006:31 | x.m3() |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1007:18:1007:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1007:18:1007:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1007:18:1007:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1007:18:1007:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1007:26:1007:26 | y |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1007:26:1007:26 | y | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1007:26:1007:31 | y.m3() |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1009:13:1009:13 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1009:13:1009:13 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1009:17:1009:33 | MyThing {...} |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1009:17:1009:33 | MyThing {...} | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1009:30:1009:31 | S1 |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:13:1010:13 | s |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:17:1010:32 | call_trait_m1(...) |  | main.rs:922:5:923:14 | S1 |
-| main.rs:1010:31:1010:31 | x |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1010:31:1010:31 | x | A | main.rs:922:5:923:14 | S1 |
-| main.rs:1012:13:1012:13 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1012:13:1012:13 | x | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1012:17:1012:34 | MyThing2 {...} |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1012:17:1012:34 | MyThing2 {...} | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1012:31:1012:32 | S2 |  | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:13:1013:13 | s |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1013:13:1013:13 | s | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:17:1013:32 | call_trait_m1(...) |  | main.rs:912:5:915:5 | MyThing |
-| main.rs:1013:17:1013:32 | call_trait_m1(...) | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1013:31:1013:31 | x |  | main.rs:917:5:920:5 | MyThing2 |
-| main.rs:1013:31:1013:31 | x | A | main.rs:924:5:925:14 | S2 |
-| main.rs:1030:22:1030:22 | x |  | file://:0:0:0:0 | & |
-| main.rs:1030:22:1030:22 | x | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1030:35:1032:5 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1030:35:1032:5 | { ... } | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1031:9:1031:9 | x |  | file://:0:0:0:0 | & |
-| main.rs:1031:9:1031:9 | x | &T | main.rs:1030:11:1030:19 | T |
-| main.rs:1035:17:1035:20 | SelfParam |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1035:29:1037:9 | { ... } |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1036:13:1036:14 | S2 |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1040:21:1040:21 | x |  | main.rs:1040:13:1040:14 | T1 |
-| main.rs:1043:5:1045:5 | { ... } |  | main.rs:1040:17:1040:18 | T2 |
-| main.rs:1044:9:1044:9 | x |  | main.rs:1040:13:1040:14 | T1 |
-| main.rs:1044:9:1044:16 | x.into() |  | main.rs:1040:17:1040:18 | T2 |
-| main.rs:1048:13:1048:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1048:17:1048:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
+| main.rs:540:18:540:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:540:18:540:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:540:26:540:26 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:540:26:540:42 | x.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:541:18:541:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:541:18:541:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:541:18:541:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:541:18:541:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:541:26:541:26 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:541:26:541:44 | x.common_method_2() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:543:13:543:13 | y |  | main.rs:479:5:479:22 | S2 |
+| main.rs:543:13:543:13 | y | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:543:17:543:22 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:543:17:543:22 | S2(...) | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:543:20:543:21 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:544:18:544:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:544:18:544:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:544:18:544:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:544:18:544:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:544:26:544:26 | y |  | main.rs:479:5:479:22 | S2 |
+| main.rs:544:26:544:26 | y | T2 | main.rs:446:5:447:14 | S1 |
+| main.rs:544:26:544:42 | y.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:546:13:546:13 | z |  | main.rs:479:5:479:22 | S2 |
+| main.rs:546:13:546:13 | z | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:546:17:546:21 | S2(...) |  | main.rs:479:5:479:22 | S2 |
+| main.rs:546:17:546:21 | S2(...) | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:546:20:546:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:547:18:547:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:547:18:547:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:547:18:547:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:547:18:547:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:547:26:547:26 | z |  | main.rs:479:5:479:22 | S2 |
+| main.rs:547:26:547:26 | z | T2 | {EXTERNAL LOCATION} | i32 |
+| main.rs:547:26:547:42 | z.common_method() |  | main.rs:446:5:447:14 | S1 |
+| main.rs:549:13:549:13 | w |  | main.rs:517:5:518:22 | S3 |
+| main.rs:549:13:549:13 | w | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:549:17:549:22 | S3(...) |  | main.rs:517:5:518:22 | S3 |
+| main.rs:549:17:549:22 | S3(...) | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:549:20:549:21 | S1 |  | main.rs:446:5:447:14 | S1 |
+| main.rs:550:18:550:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:550:18:550:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:550:18:550:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:550:18:550:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:550:26:550:26 | w |  | main.rs:517:5:518:22 | S3 |
+| main.rs:550:26:550:26 | w | T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:550:26:550:31 | w.m(...) |  | file://:0:0:0:0 | & |
+| main.rs:550:26:550:31 | w.m(...) | &T | main.rs:517:5:518:22 | S3 |
+| main.rs:550:26:550:31 | w.m(...) | &T.T3 | main.rs:446:5:447:14 | S1 |
+| main.rs:550:30:550:30 | x |  | main.rs:446:5:447:14 | S1 |
+| main.rs:567:19:567:22 | SelfParam |  | main.rs:565:5:568:5 | Self [trait FirstTrait] |
+| main.rs:572:19:572:22 | SelfParam |  | main.rs:570:5:573:5 | Self [trait SecondTrait] |
+| main.rs:575:64:575:64 | x |  | main.rs:575:45:575:61 | T |
+| main.rs:577:13:577:14 | s1 |  | main.rs:575:35:575:42 | I |
+| main.rs:577:18:577:18 | x |  | main.rs:575:45:575:61 | T |
+| main.rs:577:18:577:27 | x.method() |  | main.rs:575:35:575:42 | I |
+| main.rs:578:18:578:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:578:18:578:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:578:18:578:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:578:18:578:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:578:26:578:27 | s1 |  | main.rs:575:35:575:42 | I |
+| main.rs:581:65:581:65 | x |  | main.rs:581:46:581:62 | T |
+| main.rs:583:13:583:14 | s2 |  | main.rs:581:36:581:43 | I |
+| main.rs:583:18:583:18 | x |  | main.rs:581:46:581:62 | T |
+| main.rs:583:18:583:27 | x.method() |  | main.rs:581:36:581:43 | I |
+| main.rs:584:18:584:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:584:18:584:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:584:18:584:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:584:18:584:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:584:26:584:27 | s2 |  | main.rs:581:36:581:43 | I |
+| main.rs:587:49:587:49 | x |  | main.rs:587:30:587:46 | T |
+| main.rs:588:13:588:13 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:588:17:588:17 | x |  | main.rs:587:30:587:46 | T |
+| main.rs:588:17:588:26 | x.method() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:589:18:589:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:589:18:589:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:589:18:589:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:589:18:589:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:589:26:589:26 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:592:53:592:53 | x |  | main.rs:592:34:592:50 | T |
+| main.rs:593:13:593:13 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:593:17:593:17 | x |  | main.rs:592:34:592:50 | T |
+| main.rs:593:17:593:26 | x.method() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:594:18:594:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:594:18:594:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:594:18:594:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:594:18:594:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:594:26:594:26 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:597:43:597:43 | x |  | main.rs:597:40:597:40 | T |
+| main.rs:601:13:601:13 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:601:17:601:17 | x |  | main.rs:597:40:597:40 | T |
+| main.rs:601:17:601:26 | x.method() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:602:18:602:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:602:18:602:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:602:18:602:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:602:18:602:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:602:26:602:26 | s |  | main.rs:557:5:558:14 | S1 |
+| main.rs:606:16:606:19 | SelfParam |  | main.rs:605:5:609:5 | Self [trait Pair] |
+| main.rs:608:16:608:19 | SelfParam |  | main.rs:605:5:609:5 | Self [trait Pair] |
+| main.rs:611:53:611:53 | x |  | main.rs:611:50:611:50 | T |
+| main.rs:611:59:611:59 | y |  | main.rs:611:50:611:50 | T |
+| main.rs:616:13:616:13 | _ |  | main.rs:557:5:558:14 | S1 |
+| main.rs:616:17:616:17 | x |  | main.rs:611:50:611:50 | T |
+| main.rs:616:17:616:23 | x.fst() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:617:13:617:13 | _ |  | main.rs:557:5:558:14 | S1 |
+| main.rs:617:17:617:17 | y |  | main.rs:611:50:611:50 | T |
+| main.rs:617:17:617:26 | y.method() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:620:58:620:58 | x |  | main.rs:620:41:620:55 | T |
+| main.rs:620:64:620:64 | y |  | main.rs:620:41:620:55 | T |
+| main.rs:622:13:622:14 | s1 |  | main.rs:557:5:558:14 | S1 |
+| main.rs:622:18:622:18 | x |  | main.rs:620:41:620:55 | T |
+| main.rs:622:18:622:24 | x.fst() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:623:13:623:14 | s2 |  | main.rs:560:5:561:14 | S2 |
+| main.rs:623:18:623:18 | y |  | main.rs:620:41:620:55 | T |
+| main.rs:623:18:623:24 | y.snd() |  | main.rs:560:5:561:14 | S2 |
+| main.rs:624:18:624:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:624:18:624:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:624:18:624:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:624:18:624:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:624:32:624:33 | s1 |  | main.rs:557:5:558:14 | S1 |
+| main.rs:624:36:624:37 | s2 |  | main.rs:560:5:561:14 | S2 |
+| main.rs:627:69:627:69 | x |  | main.rs:627:52:627:66 | T |
+| main.rs:627:75:627:75 | y |  | main.rs:627:52:627:66 | T |
+| main.rs:629:13:629:14 | s1 |  | main.rs:557:5:558:14 | S1 |
+| main.rs:629:18:629:18 | x |  | main.rs:627:52:627:66 | T |
+| main.rs:629:18:629:24 | x.fst() |  | main.rs:557:5:558:14 | S1 |
+| main.rs:630:13:630:14 | s2 |  | main.rs:627:41:627:49 | T2 |
+| main.rs:630:18:630:18 | y |  | main.rs:627:52:627:66 | T |
+| main.rs:630:18:630:24 | y.snd() |  | main.rs:627:41:627:49 | T2 |
+| main.rs:631:18:631:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:631:18:631:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:631:18:631:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:631:18:631:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:631:32:631:33 | s1 |  | main.rs:557:5:558:14 | S1 |
+| main.rs:631:36:631:37 | s2 |  | main.rs:627:41:627:49 | T2 |
+| main.rs:634:50:634:50 | x |  | main.rs:634:41:634:47 | T |
+| main.rs:634:56:634:56 | y |  | main.rs:634:41:634:47 | T |
+| main.rs:636:13:636:14 | s1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:636:18:636:18 | x |  | main.rs:634:41:634:47 | T |
+| main.rs:636:18:636:24 | x.fst() |  | {EXTERNAL LOCATION} | bool |
+| main.rs:637:13:637:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:637:18:637:18 | y |  | main.rs:634:41:634:47 | T |
+| main.rs:637:18:637:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:638:18:638:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:638:18:638:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:638:18:638:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:638:18:638:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:638:32:638:33 | s1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:638:36:638:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:641:54:641:54 | x |  | main.rs:641:41:641:51 | T |
+| main.rs:641:60:641:60 | y |  | main.rs:641:41:641:51 | T |
+| main.rs:643:13:643:14 | s1 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:643:18:643:18 | x |  | main.rs:641:41:641:51 | T |
+| main.rs:643:18:643:24 | x.fst() |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:644:13:644:14 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:644:18:644:18 | y |  | main.rs:641:41:641:51 | T |
+| main.rs:644:18:644:24 | y.snd() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:645:18:645:29 | "{:?}, {:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:645:18:645:29 | "{:?}, {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:645:18:645:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:645:18:645:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:645:32:645:33 | s1 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:645:36:645:37 | s2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:661:15:661:18 | SelfParam |  | main.rs:660:5:669:5 | Self [trait MyTrait] |
+| main.rs:663:15:663:18 | SelfParam |  | main.rs:660:5:669:5 | Self [trait MyTrait] |
+| main.rs:666:9:668:9 | { ... } |  | main.rs:660:19:660:19 | A |
+| main.rs:667:13:667:16 | self |  | main.rs:660:5:669:5 | Self [trait MyTrait] |
+| main.rs:667:13:667:21 | self.m1() |  | main.rs:660:19:660:19 | A |
+| main.rs:673:43:673:43 | x |  | main.rs:673:26:673:40 | T2 |
+| main.rs:673:56:675:5 | { ... } |  | main.rs:673:22:673:23 | T1 |
+| main.rs:674:9:674:9 | x |  | main.rs:673:26:673:40 | T2 |
+| main.rs:674:9:674:14 | x.m1() |  | main.rs:673:22:673:23 | T1 |
+| main.rs:679:49:679:49 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:679:49:679:49 | x | T | main.rs:679:32:679:46 | T2 |
+| main.rs:679:71:681:5 | { ... } |  | main.rs:679:28:679:29 | T1 |
+| main.rs:680:9:680:9 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:680:9:680:9 | x | T | main.rs:679:32:679:46 | T2 |
+| main.rs:680:9:680:11 | x.a |  | main.rs:679:32:679:46 | T2 |
+| main.rs:680:9:680:16 | ... .m1() |  | main.rs:679:28:679:29 | T1 |
+| main.rs:684:15:684:18 | SelfParam |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:684:15:684:18 | SelfParam | T | main.rs:683:10:683:10 | T |
+| main.rs:684:26:686:9 | { ... } |  | main.rs:683:10:683:10 | T |
+| main.rs:685:13:685:16 | self |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:685:13:685:16 | self | T | main.rs:683:10:683:10 | T |
+| main.rs:685:13:685:18 | self.a |  | main.rs:683:10:683:10 | T |
+| main.rs:690:13:690:13 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:690:13:690:13 | x | T | main.rs:655:5:656:14 | S1 |
+| main.rs:690:17:690:33 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:690:17:690:33 | MyThing {...} | T | main.rs:655:5:656:14 | S1 |
+| main.rs:690:30:690:31 | S1 |  | main.rs:655:5:656:14 | S1 |
+| main.rs:691:13:691:13 | y |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:691:13:691:13 | y | T | main.rs:657:5:658:14 | S2 |
+| main.rs:691:17:691:33 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:691:17:691:33 | MyThing {...} | T | main.rs:657:5:658:14 | S2 |
+| main.rs:691:30:691:31 | S2 |  | main.rs:657:5:658:14 | S2 |
+| main.rs:693:18:693:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:693:18:693:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:693:18:693:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:693:18:693:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:693:26:693:26 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:693:26:693:26 | x | T | main.rs:655:5:656:14 | S1 |
+| main.rs:693:26:693:31 | x.m1() |  | main.rs:655:5:656:14 | S1 |
+| main.rs:694:18:694:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:694:18:694:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:694:18:694:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:694:18:694:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:694:26:694:26 | y |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:694:26:694:26 | y | T | main.rs:657:5:658:14 | S2 |
+| main.rs:694:26:694:31 | y.m1() |  | main.rs:657:5:658:14 | S2 |
+| main.rs:696:13:696:13 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:696:13:696:13 | x | T | main.rs:655:5:656:14 | S1 |
+| main.rs:696:17:696:33 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:696:17:696:33 | MyThing {...} | T | main.rs:655:5:656:14 | S1 |
+| main.rs:696:30:696:31 | S1 |  | main.rs:655:5:656:14 | S1 |
+| main.rs:697:13:697:13 | y |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:697:13:697:13 | y | T | main.rs:657:5:658:14 | S2 |
+| main.rs:697:17:697:33 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:697:17:697:33 | MyThing {...} | T | main.rs:657:5:658:14 | S2 |
+| main.rs:697:30:697:31 | S2 |  | main.rs:657:5:658:14 | S2 |
+| main.rs:699:18:699:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:699:18:699:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:699:18:699:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:699:18:699:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:699:26:699:26 | x |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:699:26:699:26 | x | T | main.rs:655:5:656:14 | S1 |
+| main.rs:699:26:699:31 | x.m2() |  | main.rs:655:5:656:14 | S1 |
+| main.rs:700:18:700:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:700:18:700:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:700:18:700:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:700:18:700:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:700:26:700:26 | y |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:700:26:700:26 | y | T | main.rs:657:5:658:14 | S2 |
+| main.rs:700:26:700:31 | y.m2() |  | main.rs:657:5:658:14 | S2 |
+| main.rs:702:13:702:14 | x2 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:702:13:702:14 | x2 | T | main.rs:655:5:656:14 | S1 |
+| main.rs:702:18:702:34 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:702:18:702:34 | MyThing {...} | T | main.rs:655:5:656:14 | S1 |
+| main.rs:702:31:702:32 | S1 |  | main.rs:655:5:656:14 | S1 |
+| main.rs:703:13:703:14 | y2 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:703:13:703:14 | y2 | T | main.rs:657:5:658:14 | S2 |
+| main.rs:703:18:703:34 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:703:18:703:34 | MyThing {...} | T | main.rs:657:5:658:14 | S2 |
+| main.rs:703:31:703:32 | S2 |  | main.rs:657:5:658:14 | S2 |
+| main.rs:705:18:705:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:705:18:705:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:705:18:705:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:705:18:705:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:705:26:705:42 | call_trait_m1(...) |  | main.rs:655:5:656:14 | S1 |
+| main.rs:705:40:705:41 | x2 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:705:40:705:41 | x2 | T | main.rs:655:5:656:14 | S1 |
+| main.rs:706:18:706:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:706:18:706:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:706:18:706:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:706:18:706:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:706:26:706:42 | call_trait_m1(...) |  | main.rs:657:5:658:14 | S2 |
+| main.rs:706:40:706:41 | y2 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:706:40:706:41 | y2 | T | main.rs:657:5:658:14 | S2 |
+| main.rs:708:13:708:14 | x3 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:708:13:708:14 | x3 | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:708:13:708:14 | x3 | T.T | main.rs:655:5:656:14 | S1 |
+| main.rs:708:18:710:9 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:708:18:710:9 | MyThing {...} | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:708:18:710:9 | MyThing {...} | T.T | main.rs:655:5:656:14 | S1 |
+| main.rs:709:16:709:32 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:709:16:709:32 | MyThing {...} | T | main.rs:655:5:656:14 | S1 |
+| main.rs:709:29:709:30 | S1 |  | main.rs:655:5:656:14 | S1 |
+| main.rs:711:13:711:14 | y3 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:711:13:711:14 | y3 | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:711:13:711:14 | y3 | T.T | main.rs:657:5:658:14 | S2 |
+| main.rs:711:18:713:9 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:711:18:713:9 | MyThing {...} | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:711:18:713:9 | MyThing {...} | T.T | main.rs:657:5:658:14 | S2 |
+| main.rs:712:16:712:32 | MyThing {...} |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:712:16:712:32 | MyThing {...} | T | main.rs:657:5:658:14 | S2 |
+| main.rs:712:29:712:30 | S2 |  | main.rs:657:5:658:14 | S2 |
+| main.rs:715:13:715:13 | a |  | main.rs:655:5:656:14 | S1 |
+| main.rs:715:17:715:39 | call_trait_thing_m1(...) |  | main.rs:655:5:656:14 | S1 |
+| main.rs:715:37:715:38 | x3 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:715:37:715:38 | x3 | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:715:37:715:38 | x3 | T.T | main.rs:655:5:656:14 | S1 |
+| main.rs:716:18:716:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:716:18:716:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:716:18:716:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:716:18:716:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:716:26:716:26 | a |  | main.rs:655:5:656:14 | S1 |
+| main.rs:717:13:717:13 | b |  | main.rs:657:5:658:14 | S2 |
+| main.rs:717:17:717:39 | call_trait_thing_m1(...) |  | main.rs:657:5:658:14 | S2 |
+| main.rs:717:37:717:38 | y3 |  | main.rs:650:5:653:5 | MyThing |
+| main.rs:717:37:717:38 | y3 | T | main.rs:650:5:653:5 | MyThing |
+| main.rs:717:37:717:38 | y3 | T.T | main.rs:657:5:658:14 | S2 |
+| main.rs:718:18:718:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:718:18:718:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:718:18:718:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:718:18:718:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:718:26:718:26 | b |  | main.rs:657:5:658:14 | S2 |
+| main.rs:729:19:729:22 | SelfParam |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:729:19:729:22 | SelfParam | A | main.rs:728:10:728:10 | A |
+| main.rs:729:30:731:9 | { ... } |  | main.rs:728:10:728:10 | A |
+| main.rs:730:13:730:16 | self |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:730:13:730:16 | self | A | main.rs:728:10:728:10 | A |
+| main.rs:730:13:730:22 | self.field |  | main.rs:728:10:728:10 | A |
+| main.rs:738:15:738:18 | SelfParam |  | main.rs:734:5:748:5 | Self [trait MyTrait] |
+| main.rs:740:15:740:18 | SelfParam |  | main.rs:734:5:748:5 | Self [trait MyTrait] |
+| main.rs:744:9:747:9 | { ... } |  | main.rs:735:9:735:28 | AssociatedType |
+| main.rs:745:13:745:16 | self |  | main.rs:734:5:748:5 | Self [trait MyTrait] |
+| main.rs:745:13:745:21 | self.m1() |  | main.rs:735:9:735:28 | AssociatedType |
+| main.rs:746:13:746:43 | ...::default(...) |  | main.rs:735:9:735:28 | AssociatedType |
+| main.rs:754:19:754:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:754:19:754:23 | SelfParam | &T | main.rs:750:5:760:5 | Self [trait MyTraitAssoc2] |
+| main.rs:754:26:754:26 | a |  | main.rs:754:16:754:16 | A |
+| main.rs:756:22:756:26 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:756:22:756:26 | SelfParam | &T | main.rs:750:5:760:5 | Self [trait MyTraitAssoc2] |
+| main.rs:756:29:756:29 | a |  | main.rs:756:19:756:19 | A |
+| main.rs:756:35:756:35 | b |  | main.rs:756:19:756:19 | A |
+| main.rs:756:75:759:9 | { ... } |  | main.rs:751:9:751:52 | GenericAssociatedType |
+| main.rs:757:13:757:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:757:13:757:16 | self | &T | main.rs:750:5:760:5 | Self [trait MyTraitAssoc2] |
+| main.rs:757:13:757:23 | self.put(...) |  | main.rs:751:9:751:52 | GenericAssociatedType |
+| main.rs:757:22:757:22 | a |  | main.rs:756:19:756:19 | A |
+| main.rs:758:13:758:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:758:13:758:16 | self | &T | main.rs:750:5:760:5 | Self [trait MyTraitAssoc2] |
+| main.rs:758:13:758:23 | self.put(...) |  | main.rs:751:9:751:52 | GenericAssociatedType |
+| main.rs:758:22:758:22 | b |  | main.rs:756:19:756:19 | A |
+| main.rs:767:21:767:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:767:21:767:25 | SelfParam | &T | main.rs:762:5:772:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:769:20:769:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:769:20:769:24 | SelfParam | &T | main.rs:762:5:772:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:771:20:771:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:771:20:771:24 | SelfParam | &T | main.rs:762:5:772:5 | Self [trait TraitMultipleAssoc] |
+| main.rs:787:15:787:18 | SelfParam |  | main.rs:774:5:775:13 | S |
+| main.rs:787:45:789:9 | { ... } |  | main.rs:780:5:781:14 | AT |
+| main.rs:788:13:788:14 | AT |  | main.rs:780:5:781:14 | AT |
+| main.rs:797:19:797:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:797:19:797:23 | SelfParam | &T | main.rs:774:5:775:13 | S |
+| main.rs:797:26:797:26 | a |  | main.rs:797:16:797:16 | A |
+| main.rs:797:46:799:9 | { ... } |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:797:46:799:9 | { ... } | A | main.rs:797:16:797:16 | A |
+| main.rs:798:13:798:32 | Wrapper {...} |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:798:13:798:32 | Wrapper {...} | A | main.rs:797:16:797:16 | A |
+| main.rs:798:30:798:30 | a |  | main.rs:797:16:797:16 | A |
+| main.rs:806:15:806:18 | SelfParam |  | main.rs:777:5:778:14 | S2 |
+| main.rs:806:45:808:9 | { ... } |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:806:45:808:9 | { ... } | A | main.rs:777:5:778:14 | S2 |
+| main.rs:807:13:807:35 | Wrapper {...} |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:807:13:807:35 | Wrapper {...} | A | main.rs:777:5:778:14 | S2 |
+| main.rs:807:30:807:33 | self |  | main.rs:777:5:778:14 | S2 |
+| main.rs:813:30:815:9 | { ... } |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:813:30:815:9 | { ... } | A | main.rs:777:5:778:14 | S2 |
+| main.rs:814:13:814:33 | Wrapper {...} |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:814:13:814:33 | Wrapper {...} | A | main.rs:777:5:778:14 | S2 |
+| main.rs:814:30:814:31 | S2 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:820:22:820:26 | thing |  | main.rs:820:10:820:19 | T |
+| main.rs:821:9:821:13 | thing |  | main.rs:820:10:820:19 | T |
+| main.rs:828:21:828:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:828:21:828:25 | SelfParam | &T | main.rs:780:5:781:14 | AT |
+| main.rs:828:34:830:9 | { ... } |  | main.rs:780:5:781:14 | AT |
+| main.rs:829:13:829:14 | AT |  | main.rs:780:5:781:14 | AT |
+| main.rs:832:20:832:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:832:20:832:24 | SelfParam | &T | main.rs:780:5:781:14 | AT |
+| main.rs:832:43:834:9 | { ... } |  | main.rs:774:5:775:13 | S |
+| main.rs:833:13:833:13 | S |  | main.rs:774:5:775:13 | S |
+| main.rs:836:20:836:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:836:20:836:24 | SelfParam | &T | main.rs:780:5:781:14 | AT |
+| main.rs:836:43:838:9 | { ... } |  | main.rs:777:5:778:14 | S2 |
+| main.rs:837:13:837:14 | S2 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:842:13:842:14 | x1 |  | main.rs:774:5:775:13 | S |
+| main.rs:842:18:842:18 | S |  | main.rs:774:5:775:13 | S |
+| main.rs:844:18:844:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:844:18:844:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:844:18:844:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:844:18:844:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:844:26:844:27 | x1 |  | main.rs:774:5:775:13 | S |
+| main.rs:844:26:844:32 | x1.m1() |  | main.rs:780:5:781:14 | AT |
+| main.rs:846:13:846:14 | x2 |  | main.rs:774:5:775:13 | S |
+| main.rs:846:18:846:18 | S |  | main.rs:774:5:775:13 | S |
+| main.rs:848:13:848:13 | y |  | main.rs:780:5:781:14 | AT |
+| main.rs:848:17:848:18 | x2 |  | main.rs:774:5:775:13 | S |
+| main.rs:848:17:848:23 | x2.m2() |  | main.rs:780:5:781:14 | AT |
+| main.rs:849:18:849:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:849:18:849:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:849:18:849:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:849:18:849:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:849:26:849:26 | y |  | main.rs:780:5:781:14 | AT |
+| main.rs:851:13:851:14 | x3 |  | main.rs:774:5:775:13 | S |
+| main.rs:851:18:851:18 | S |  | main.rs:774:5:775:13 | S |
+| main.rs:853:18:853:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:853:18:853:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:853:18:853:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:853:18:853:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:853:26:853:27 | x3 |  | main.rs:774:5:775:13 | S |
+| main.rs:853:26:853:34 | x3.put(...) |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:853:26:853:34 | x3.put(...) | A | {EXTERNAL LOCATION} | i32 |
+| main.rs:853:26:853:43 | ... .unwrap() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:853:33:853:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:856:18:856:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:856:18:856:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:856:18:856:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:856:18:856:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:856:26:856:27 | x3 |  | main.rs:774:5:775:13 | S |
+| main.rs:856:26:856:40 | x3.putTwo(...) |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:856:26:856:40 | x3.putTwo(...) | A | main.rs:794:36:794:50 | AssociatedParam |
+| main.rs:856:26:856:49 | ... .unwrap() |  | main.rs:794:36:794:50 | AssociatedParam |
+| main.rs:856:36:856:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:856:39:856:39 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:858:20:858:20 | S |  | main.rs:774:5:775:13 | S |
+| main.rs:859:18:859:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:859:18:859:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:859:18:859:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:859:18:859:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:861:13:861:14 | x5 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:861:18:861:19 | S2 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:862:18:862:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:862:18:862:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:862:18:862:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:862:18:862:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:862:26:862:27 | x5 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:862:26:862:32 | x5.m1() |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:862:26:862:32 | x5.m1() | A | main.rs:777:5:778:14 | S2 |
+| main.rs:863:13:863:14 | x6 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:863:18:863:19 | S2 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:864:18:864:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:864:18:864:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:864:18:864:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:864:18:864:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:864:26:864:27 | x6 |  | main.rs:777:5:778:14 | S2 |
+| main.rs:864:26:864:32 | x6.m2() |  | main.rs:723:5:726:5 | Wrapper |
+| main.rs:864:26:864:32 | x6.m2() | A | main.rs:777:5:778:14 | S2 |
+| main.rs:866:13:866:22 | assoc_zero |  | main.rs:780:5:781:14 | AT |
+| main.rs:866:26:866:27 | AT |  | main.rs:780:5:781:14 | AT |
+| main.rs:866:26:866:38 | AT.get_zero() |  | main.rs:780:5:781:14 | AT |
+| main.rs:867:13:867:21 | assoc_one |  | main.rs:774:5:775:13 | S |
+| main.rs:867:25:867:26 | AT |  | main.rs:780:5:781:14 | AT |
+| main.rs:867:25:867:36 | AT.get_one() |  | main.rs:774:5:775:13 | S |
+| main.rs:868:13:868:21 | assoc_two |  | main.rs:777:5:778:14 | S2 |
+| main.rs:868:25:868:26 | AT |  | main.rs:780:5:781:14 | AT |
+| main.rs:868:25:868:36 | AT.get_two() |  | main.rs:777:5:778:14 | S2 |
+| main.rs:876:19:876:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:876:19:876:23 | SelfParam | &T | main.rs:873:5:877:5 | Self [trait Supertrait] |
+| main.rs:876:26:876:32 | content |  | main.rs:874:9:874:21 | Content |
+| main.rs:881:24:881:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:881:24:881:28 | SelfParam | &T | main.rs:879:5:882:5 | Self [trait Subtrait] |
+| main.rs:890:23:890:27 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:890:23:890:27 | SelfParam | &T | main.rs:884:5:894:5 | Self [trait Subtrait2] |
+| main.rs:890:30:890:31 | c1 |  | main.rs:874:9:874:21 | Content |
+| main.rs:890:49:890:50 | c2 |  | main.rs:874:9:874:21 | Content |
+| main.rs:891:13:891:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:891:13:891:16 | self | &T | main.rs:884:5:894:5 | Self [trait Subtrait2] |
+| main.rs:891:25:891:26 | c1 |  | main.rs:874:9:874:21 | Content |
+| main.rs:892:13:892:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:892:13:892:16 | self | &T | main.rs:884:5:894:5 | Self [trait Subtrait2] |
+| main.rs:892:25:892:26 | c2 |  | main.rs:874:9:874:21 | Content |
+| main.rs:900:19:900:23 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:900:19:900:23 | SelfParam | &T | main.rs:896:5:896:24 | MyType |
+| main.rs:900:19:900:23 | SelfParam | &T.T | main.rs:898:10:898:10 | T |
+| main.rs:900:26:900:33 | _content |  | main.rs:898:10:898:10 | T |
+| main.rs:901:22:901:42 | "Inserting content: \\n" |  | file://:0:0:0:0 | & |
+| main.rs:901:22:901:42 | "Inserting content: \\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:901:22:901:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:901:22:901:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:907:24:907:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:907:24:907:28 | SelfParam | &T | main.rs:896:5:896:24 | MyType |
+| main.rs:907:24:907:28 | SelfParam | &T.T | main.rs:905:10:905:17 | T |
+| main.rs:907:48:909:9 | { ... } |  | main.rs:905:10:905:17 | T |
+| main.rs:908:13:908:19 | (...) |  | main.rs:896:5:896:24 | MyType |
+| main.rs:908:13:908:19 | (...) | T | main.rs:905:10:905:17 | T |
+| main.rs:908:13:908:21 | ... .0 |  | main.rs:905:10:905:17 | T |
+| main.rs:908:13:908:29 | ... .clone() |  | main.rs:905:10:905:17 | T |
+| main.rs:908:14:908:18 | * ... |  | main.rs:896:5:896:24 | MyType |
+| main.rs:908:14:908:18 | * ... | T | main.rs:905:10:905:17 | T |
+| main.rs:908:15:908:18 | self |  | file://:0:0:0:0 | & |
+| main.rs:908:15:908:18 | self | &T | main.rs:896:5:896:24 | MyType |
+| main.rs:908:15:908:18 | self | &T.T | main.rs:905:10:905:17 | T |
+| main.rs:912:33:912:36 | item |  | file://:0:0:0:0 | & |
+| main.rs:912:33:912:36 | item | &T | main.rs:912:20:912:30 | T |
+| main.rs:912:57:914:5 | { ... } |  | main.rs:874:9:874:21 | Content |
+| main.rs:913:9:913:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:913:9:913:12 | item | &T | main.rs:912:20:912:30 | T |
+| main.rs:913:9:913:26 | item.get_content() |  | main.rs:874:9:874:21 | Content |
+| main.rs:916:35:916:38 | item |  | file://:0:0:0:0 | & |
+| main.rs:916:35:916:38 | item | &T | main.rs:916:21:916:32 | T |
+| main.rs:916:45:916:46 | c1 |  | main.rs:874:9:874:21 | Content |
+| main.rs:916:61:916:62 | c2 |  | main.rs:874:9:874:21 | Content |
+| main.rs:916:77:916:78 | c3 |  | main.rs:874:9:874:21 | Content |
+| main.rs:917:9:917:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:917:9:917:12 | item | &T | main.rs:916:21:916:32 | T |
+| main.rs:917:21:917:22 | c1 |  | main.rs:874:9:874:21 | Content |
+| main.rs:918:9:918:12 | item |  | file://:0:0:0:0 | & |
+| main.rs:918:9:918:12 | item | &T | main.rs:916:21:916:32 | T |
+| main.rs:918:25:918:26 | c2 |  | main.rs:874:9:874:21 | Content |
+| main.rs:918:29:918:30 | c3 |  | main.rs:874:9:874:21 | Content |
+| main.rs:922:13:922:17 | item1 |  | main.rs:896:5:896:24 | MyType |
+| main.rs:922:13:922:17 | item1 | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:922:21:922:33 | MyType(...) |  | main.rs:896:5:896:24 | MyType |
+| main.rs:922:21:922:33 | MyType(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:922:28:922:32 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:923:25:923:29 | item1 |  | main.rs:896:5:896:24 | MyType |
+| main.rs:923:25:923:29 | item1 | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:925:13:925:17 | item2 |  | main.rs:896:5:896:24 | MyType |
+| main.rs:925:13:925:17 | item2 | T | {EXTERNAL LOCATION} | bool |
+| main.rs:925:21:925:32 | MyType(...) |  | main.rs:896:5:896:24 | MyType |
+| main.rs:925:21:925:32 | MyType(...) | T | {EXTERNAL LOCATION} | bool |
+| main.rs:925:28:925:31 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:926:37:926:42 | &item2 |  | file://:0:0:0:0 | & |
+| main.rs:926:37:926:42 | &item2 | &T | main.rs:896:5:896:24 | MyType |
+| main.rs:926:37:926:42 | &item2 | &T.T | {EXTERNAL LOCATION} | bool |
+| main.rs:926:38:926:42 | item2 |  | main.rs:896:5:896:24 | MyType |
+| main.rs:926:38:926:42 | item2 | T | {EXTERNAL LOCATION} | bool |
+| main.rs:943:15:943:18 | SelfParam |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:943:15:943:18 | SelfParam | A | main.rs:942:10:942:10 | T |
+| main.rs:943:26:948:9 | { ... } |  | main.rs:942:10:942:10 | T |
+| main.rs:944:13:947:13 | match self { ... } |  | main.rs:942:10:942:10 | T |
+| main.rs:944:19:944:22 | self |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:944:19:944:22 | self | A | main.rs:942:10:942:10 | T |
+| main.rs:945:17:945:29 | ...::C1(...) |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:945:17:945:29 | ...::C1(...) | A | main.rs:942:10:942:10 | T |
+| main.rs:945:28:945:28 | a |  | main.rs:942:10:942:10 | T |
+| main.rs:945:34:945:34 | a |  | main.rs:942:10:942:10 | T |
+| main.rs:946:17:946:32 | ...::C2 {...} |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:946:17:946:32 | ...::C2 {...} | A | main.rs:942:10:942:10 | T |
+| main.rs:946:30:946:30 | a |  | main.rs:942:10:942:10 | T |
+| main.rs:946:37:946:37 | a |  | main.rs:942:10:942:10 | T |
+| main.rs:952:13:952:13 | x |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:952:13:952:13 | x | A | main.rs:937:5:938:14 | S1 |
+| main.rs:952:17:952:30 | ...::C1(...) |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:952:17:952:30 | ...::C1(...) | A | main.rs:937:5:938:14 | S1 |
+| main.rs:952:28:952:29 | S1 |  | main.rs:937:5:938:14 | S1 |
+| main.rs:953:13:953:13 | y |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:953:13:953:13 | y | A | main.rs:939:5:940:14 | S2 |
+| main.rs:953:17:953:36 | ...::C2 {...} |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:953:17:953:36 | ...::C2 {...} | A | main.rs:939:5:940:14 | S2 |
+| main.rs:953:33:953:34 | S2 |  | main.rs:939:5:940:14 | S2 |
+| main.rs:955:18:955:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:955:18:955:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:955:18:955:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:955:18:955:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:955:26:955:26 | x |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:955:26:955:26 | x | A | main.rs:937:5:938:14 | S1 |
+| main.rs:955:26:955:31 | x.m1() |  | main.rs:937:5:938:14 | S1 |
+| main.rs:956:18:956:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:956:18:956:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:956:18:956:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:956:18:956:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:956:26:956:26 | y |  | main.rs:931:5:935:5 | MyEnum |
+| main.rs:956:26:956:26 | y | A | main.rs:939:5:940:14 | S2 |
+| main.rs:956:26:956:31 | y.m1() |  | main.rs:939:5:940:14 | S2 |
+| main.rs:978:15:978:18 | SelfParam |  | main.rs:976:5:979:5 | Self [trait MyTrait1] |
+| main.rs:983:15:983:18 | SelfParam |  | main.rs:981:5:993:5 | Self [trait MyTrait2] |
+| main.rs:986:9:992:9 | { ... } |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:987:13:991:13 | if ... {...} else {...} |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:987:16:987:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:987:16:987:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:987:20:987:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:987:22:989:13 | { ... } |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:988:17:988:20 | self |  | main.rs:981:5:993:5 | Self [trait MyTrait2] |
+| main.rs:988:17:988:25 | self.m1() |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:989:20:991:13 | { ... } |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:990:17:990:30 | ...::m1(...) |  | main.rs:981:20:981:22 | Tr2 |
+| main.rs:990:26:990:29 | self |  | main.rs:981:5:993:5 | Self [trait MyTrait2] |
+| main.rs:997:15:997:18 | SelfParam |  | main.rs:995:5:1007:5 | Self [trait MyTrait3] |
+| main.rs:1000:9:1006:9 | { ... } |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1001:13:1005:13 | if ... {...} else {...} |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1001:16:1001:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1001:16:1001:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1001:20:1001:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1001:22:1003:13 | { ... } |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1002:17:1002:20 | self |  | main.rs:995:5:1007:5 | Self [trait MyTrait3] |
+| main.rs:1002:17:1002:25 | self.m2() |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1002:17:1002:25 | self.m2() | A | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1002:17:1002:27 | ... .a |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1003:20:1005:13 | { ... } |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1004:17:1004:30 | ...::m2(...) |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1004:17:1004:30 | ...::m2(...) | A | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1004:17:1004:32 | ... .a |  | main.rs:995:20:995:22 | Tr3 |
+| main.rs:1004:26:1004:29 | self |  | main.rs:995:5:1007:5 | Self [trait MyTrait3] |
+| main.rs:1011:15:1011:18 | SelfParam |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1011:15:1011:18 | SelfParam | A | main.rs:1009:10:1009:10 | T |
+| main.rs:1011:26:1013:9 | { ... } |  | main.rs:1009:10:1009:10 | T |
+| main.rs:1012:13:1012:16 | self |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1012:13:1012:16 | self | A | main.rs:1009:10:1009:10 | T |
+| main.rs:1012:13:1012:18 | self.a |  | main.rs:1009:10:1009:10 | T |
+| main.rs:1020:15:1020:18 | SelfParam |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1020:15:1020:18 | SelfParam | A | main.rs:1018:10:1018:10 | T |
+| main.rs:1020:35:1022:9 | { ... } |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1020:35:1022:9 | { ... } | A | main.rs:1018:10:1018:10 | T |
+| main.rs:1021:13:1021:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1021:13:1021:33 | MyThing {...} | A | main.rs:1018:10:1018:10 | T |
+| main.rs:1021:26:1021:29 | self |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1021:26:1021:29 | self | A | main.rs:1018:10:1018:10 | T |
+| main.rs:1021:26:1021:31 | self.a |  | main.rs:1018:10:1018:10 | T |
+| main.rs:1029:44:1029:44 | x |  | main.rs:1029:26:1029:41 | T2 |
+| main.rs:1029:57:1031:5 | { ... } |  | main.rs:1029:22:1029:23 | T1 |
+| main.rs:1030:9:1030:9 | x |  | main.rs:1029:26:1029:41 | T2 |
+| main.rs:1030:9:1030:14 | x.m1() |  | main.rs:1029:22:1029:23 | T1 |
+| main.rs:1033:56:1033:56 | x |  | main.rs:1033:39:1033:53 | T |
+| main.rs:1035:13:1035:13 | a |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1035:13:1035:13 | a | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1035:17:1035:17 | x |  | main.rs:1033:39:1033:53 | T |
+| main.rs:1035:17:1035:22 | x.m1() |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1035:17:1035:22 | x.m1() | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1036:18:1036:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1036:18:1036:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1036:18:1036:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1036:18:1036:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1036:26:1036:26 | a |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1036:26:1036:26 | a | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1040:13:1040:13 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1040:13:1040:13 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1040:17:1040:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1040:17:1040:33 | MyThing {...} | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1040:30:1040:31 | S1 |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1041:13:1041:13 | y |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1041:13:1041:13 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1041:17:1041:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1041:17:1041:33 | MyThing {...} | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1041:30:1041:31 | S2 |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1043:18:1043:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1043:18:1043:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1043:18:1043:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1043:18:1043:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1043:26:1043:26 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1043:26:1043:26 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1043:26:1043:31 | x.m1() |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1044:18:1044:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1044:18:1044:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1044:18:1044:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1044:18:1044:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1044:26:1044:26 | y |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1044:26:1044:26 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1044:26:1044:31 | y.m1() |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1046:13:1046:13 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1046:13:1046:13 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1046:17:1046:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1046:17:1046:33 | MyThing {...} | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1046:30:1046:31 | S1 |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1047:13:1047:13 | y |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1047:13:1047:13 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1047:17:1047:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1047:17:1047:33 | MyThing {...} | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1047:30:1047:31 | S2 |  | main.rs:973:5:974:14 | S2 |
 | main.rs:1049:18:1049:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:1049:18:1049:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
 | main.rs:1049:18:1049:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
 | main.rs:1049:18:1049:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1049:26:1049:31 | id(...) |  | file://:0:0:0:0 | & |
-| main.rs:1049:26:1049:31 | id(...) | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1049:29:1049:30 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1049:29:1049:30 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1049:30:1049:30 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1051:13:1051:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1051:17:1051:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:18:1052:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1052:18:1052:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1052:18:1052:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1052:18:1052:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1052:26:1052:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
-| main.rs:1052:26:1052:37 | id::<...>(...) | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:35:1052:36 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1052:35:1052:36 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1052:36:1052:36 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:13:1054:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:13:1054:13 | x |  | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1054:17:1054:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1054:17:1054:18 | S1 |  | main.rs:1026:5:1026:25 | dyn Trait |
+| main.rs:1049:26:1049:26 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1049:26:1049:26 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1049:26:1049:31 | x.m2() |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1050:18:1050:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1050:18:1050:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1050:18:1050:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1050:18:1050:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1050:26:1050:26 | y |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1050:26:1050:26 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1050:26:1050:31 | y.m2() |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1052:13:1052:13 | x |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1052:13:1052:13 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1052:17:1052:34 | MyThing2 {...} |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1052:17:1052:34 | MyThing2 {...} | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1052:31:1052:32 | S1 |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1053:13:1053:13 | y |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1053:13:1053:13 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1053:17:1053:34 | MyThing2 {...} |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1053:17:1053:34 | MyThing2 {...} | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1053:31:1053:32 | S2 |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1055:18:1055:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1055:18:1055:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1055:18:1055:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1055:18:1055:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1055:26:1055:26 | x |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1055:26:1055:26 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1055:26:1055:31 | x.m3() |  | main.rs:971:5:972:14 | S1 |
 | main.rs:1056:18:1056:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
 | main.rs:1056:18:1056:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1056:18:1056:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1056:18:1056:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1056:26:1056:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
-| main.rs:1056:26:1056:44 | id::<...>(...) | &T | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1056:42:1056:43 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1056:42:1056:43 | &x | &T | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1056:42:1056:43 | &x | &T | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1056:43:1056:43 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1056:43:1056:43 | x |  | main.rs:1026:5:1026:25 | dyn Trait |
-| main.rs:1058:13:1058:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1058:17:1058:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1059:9:1059:25 | into::<...>(...) |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1059:24:1059:24 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1061:13:1061:13 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1061:17:1061:18 | S1 |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1062:13:1062:13 | y |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1062:21:1062:27 | into(...) |  | main.rs:1023:5:1024:14 | S2 |
-| main.rs:1062:26:1062:26 | x |  | main.rs:1020:5:1021:14 | S1 |
-| main.rs:1076:22:1076:25 | SelfParam |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1076:22:1076:25 | SelfParam | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1076:22:1076:25 | SelfParam | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1076:35:1083:9 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1077:13:1082:13 | match self { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1077:19:1077:22 | self |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1077:19:1077:22 | self | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1077:19:1077:22 | self | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1078:17:1078:38 | ...::PairNone(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:43:1078:82 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:50:1078:81 | "PairNone has no second elemen... |  | file://:0:0:0:0 | & |
-| main.rs:1078:50:1078:81 | "PairNone has no second elemen... | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1078:50:1078:81 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1078:50:1078:81 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1078:50:1078:81 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1078:50:1078:81 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1079:17:1079:38 | ...::PairFst(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:37:1079:37 | _ |  | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1079:43:1079:81 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:50:1079:80 | "PairFst has no second element... |  | file://:0:0:0:0 | & |
-| main.rs:1079:50:1079:80 | "PairFst has no second element... | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1079:50:1079:80 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1079:50:1079:80 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1079:50:1079:80 | MacroExpr |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1079:50:1079:80 | { ... } |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1080:17:1080:40 | ...::PairSnd(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:37:1080:39 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1080:45:1080:47 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) | Fst | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1081:17:1081:44 | ...::PairBoth(...) | Snd | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:38:1081:38 | _ |  | main.rs:1075:10:1075:12 | Fst |
-| main.rs:1081:41:1081:43 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1081:49:1081:51 | snd |  | main.rs:1075:15:1075:17 | Snd |
-| main.rs:1107:10:1107:10 | t |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1107:10:1107:10 | t | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1107:10:1107:10 | t | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1107:10:1107:10 | t | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1107:10:1107:10 | t | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:13:1108:13 | x |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:17 | t |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:17 | t | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:17 | t | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:17 | t | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:17 | t | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1108:17:1108:29 | t.unwrapSnd() | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1108:17:1108:41 | ... .unwrapSnd() |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1109:18:1109:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1109:18:1109:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1109:18:1109:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1109:18:1109:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1109:26:1109:26 | x |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1124:22:1124:25 | SelfParam |  | main.rs:1122:5:1125:5 | Self [trait TraitWithAssocType] |
-| main.rs:1132:22:1132:25 | SelfParam |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1132:22:1132:25 | SelfParam | GenT | main.rs:1127:10:1127:15 | Output |
-| main.rs:1132:44:1134:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1132:44:1134:9 | { ... } | E | main.rs:1127:10:1127:15 | Output |
-| main.rs:1132:44:1134:9 | { ... } | T | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:13:1133:22 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1133:13:1133:22 | Ok(...) | E | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:13:1133:22 | Ok(...) | T | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:16:1133:19 | self |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1133:16:1133:19 | self | GenT | main.rs:1127:10:1127:15 | Output |
-| main.rs:1133:16:1133:21 | self.0 |  | main.rs:1127:10:1127:15 | Output |
-| main.rs:1139:13:1139:14 | p1 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1139:13:1139:14 | p1 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:13:1139:14 | p1 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:26:1139:53 | ...::PairBoth(...) | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1139:47:1139:48 | S1 |  | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1139:51:1139:52 | S2 |  | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1140:18:1140:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1140:18:1140:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1140:18:1140:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1140:18:1140:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1140:26:1140:27 | p1 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1140:26:1140:27 | p1 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1140:26:1140:27 | p1 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1143:13:1143:14 | p2 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1143:13:1143:14 | p2 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1143:13:1143:14 | p2 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1143:26:1143:47 | ...::PairNone(...) | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1144:18:1144:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1144:18:1144:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1144:18:1144:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1144:18:1144:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1144:26:1144:27 | p2 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1144:26:1144:27 | p2 | Fst | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1144:26:1144:27 | p2 | Snd | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:13:1147:14 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1147:13:1147:14 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:13:1147:14 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1147:34:1147:56 | ...::PairSnd(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1147:54:1147:55 | S3 |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1148:18:1148:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1148:18:1148:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1148:18:1148:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1148:18:1148:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1148:26:1148:27 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1148:26:1148:27 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1148:26:1148:27 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1151:13:1151:14 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1151:13:1151:14 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1151:13:1151:14 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1151:35:1151:56 | ...::PairNone(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1152:18:1152:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1152:18:1152:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1152:18:1152:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1152:18:1152:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1152:26:1152:27 | p3 |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1152:26:1152:27 | p3 | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1152:26:1152:27 | p3 | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd.Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:11:1154:54 | ...::PairSnd(...) | Snd.Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) |  | main.rs:1067:5:1073:5 | PairOption |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) | Fst | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1154:31:1154:53 | ...::PairSnd(...) | Snd | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1154:51:1154:52 | S3 |  | main.rs:1092:5:1093:14 | S3 |
-| main.rs:1156:13:1156:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1156:13:1156:13 | x | E | main.rs:1086:5:1087:14 | S1 |
-| main.rs:1156:13:1156:13 | x | T | main.rs:1112:5:1112:34 | S4 |
-| main.rs:1156:13:1156:13 | x | T.T41 | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1156:13:1156:13 | x | T.T42 | main.rs:1114:5:1114:22 | S5 |
-| main.rs:1156:13:1156:13 | x | T.T42.T5 | main.rs:1089:5:1090:14 | S2 |
-| main.rs:1158:13:1158:13 | y |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1158:13:1158:13 | y | E | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:13:1158:13 | y | T | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:26 | GenS(...) |  | main.rs:1120:5:1120:28 | GenS |
-| main.rs:1158:17:1158:26 | GenS(...) | GenT | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:38 | ... .get_input() |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1158:17:1158:38 | ... .get_input() | E | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:17:1158:38 | ... .get_input() | T | {EXTERNAL LOCATION} | bool |
-| main.rs:1158:22:1158:25 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1171:16:1171:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1171:16:1171:24 | SelfParam | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1171:27:1171:31 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1173:21:1173:29 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1173:21:1173:29 | SelfParam | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1173:32:1173:36 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1174:13:1174:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1174:13:1174:16 | self | &T | main.rs:1169:5:1176:5 | Self [trait MyTrait] |
-| main.rs:1174:22:1174:26 | value |  | main.rs:1169:19:1169:19 | S |
-| main.rs:1180:16:1180:24 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1180:16:1180:24 | SelfParam | &T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1180:16:1180:24 | SelfParam | &T.T | main.rs:1178:10:1178:10 | T |
-| main.rs:1180:27:1180:31 | value |  | main.rs:1178:10:1178:10 | T |
-| main.rs:1184:26:1186:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1184:26:1186:9 | { ... } | T | main.rs:1183:10:1183:10 | T |
-| main.rs:1185:13:1185:30 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1185:13:1185:30 | ...::MyNone(...) | T | main.rs:1183:10:1183:10 | T |
-| main.rs:1190:20:1190:23 | SelfParam |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:20:1190:23 | SelfParam | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:20:1190:23 | SelfParam | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1190:41:1195:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1190:41:1195:9 | { ... } | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1191:13:1194:13 | match self { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:13:1194:13 | match self { ... } | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1191:19:1191:22 | self |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:19:1191:22 | self | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1191:19:1191:22 | self | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:17:1192:34 | ...::MyNone(...) | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1192:39:1192:56 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1192:39:1192:56 | ...::MyNone(...) | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:17:1193:35 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:17:1193:35 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:17:1193:35 | ...::MySome(...) | T.T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:34:1193:34 | x |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:34:1193:34 | x | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1193:40:1193:40 | x |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1193:40:1193:40 | x | T | main.rs:1189:10:1189:10 | T |
-| main.rs:1202:13:1202:14 | x1 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1202:13:1202:14 | x1 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1202:18:1202:37 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1202:18:1202:37 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1203:18:1203:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1203:18:1203:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1203:18:1203:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1203:18:1203:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1203:26:1203:27 | x1 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1203:26:1203:27 | x1 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1205:17:1205:18 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1205:17:1205:18 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1205:22:1205:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1205:22:1205:36 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1206:9:1206:10 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1206:9:1206:10 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1206:16:1206:16 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1207:18:1207:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1207:18:1207:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1207:18:1207:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1207:18:1207:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1207:26:1207:27 | x2 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1207:26:1207:27 | x2 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1210:17:1210:18 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1210:22:1210:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1211:9:1211:10 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1211:21:1211:21 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1212:18:1212:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1212:18:1212:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1212:18:1212:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1212:18:1212:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1212:26:1212:27 | x3 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:17:1214:18 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:17:1214:18 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1214:22:1214:36 | ...::new(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1214:22:1214:36 | ...::new(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:23:1215:29 | &mut x4 |  | file://:0:0:0:0 | & |
-| main.rs:1215:23:1215:29 | &mut x4 | &T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1215:23:1215:29 | &mut x4 | &T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:28:1215:29 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1215:28:1215:29 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1215:32:1215:32 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1216:18:1216:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1216:18:1216:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1216:18:1216:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1216:18:1216:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1216:26:1216:27 | x4 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1216:26:1216:27 | x4 | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:13:1218:14 | x5 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:13:1218:14 | x5 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:13:1218:14 | x5 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:18:1218:58 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:18:1218:58 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:18:1218:58 | ...::MySome(...) | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1218:35:1218:57 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1218:35:1218:57 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1219:18:1219:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1219:18:1219:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1219:18:1219:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1219:18:1219:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1219:26:1219:27 | x5 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:27 | x5 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:27 | x5 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1219:26:1219:37 | x5.flatten() |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1219:26:1219:37 | x5.flatten() | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:13:1221:14 | x6 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:13:1221:14 | x6 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:13:1221:14 | x6 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:18:1221:58 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:18:1221:58 | ...::MySome(...) | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:18:1221:58 | ...::MySome(...) | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1221:35:1221:57 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1221:35:1221:57 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1222:18:1222:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1222:18:1222:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1222:18:1222:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1222:18:1222:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1222:26:1222:61 | ...::flatten(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:26:1222:61 | ...::flatten(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1222:59:1222:60 | x6 |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:59:1222:60 | x6 | T | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1222:59:1222:60 | x6 | T.T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:13:1225:19 | from_if |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:13:1225:19 | from_if | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:23:1229:9 | if ... {...} else {...} |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:23:1229:9 | if ... {...} else {...} | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1225:26:1225:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1225:26:1225:30 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1225:30:1225:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1225:32:1227:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1225:32:1227:9 | { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1226:13:1226:30 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1226:13:1226:30 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1227:16:1229:9 | { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1227:16:1229:9 | { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1228:13:1228:31 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1228:13:1228:31 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1228:30:1228:30 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1230:18:1230:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1230:18:1230:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1230:18:1230:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1230:18:1230:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1230:26:1230:32 | from_if |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1230:26:1230:32 | from_if | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:13:1233:22 | from_match |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1233:13:1233:22 | from_match | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:26:1236:9 | match ... { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1233:26:1236:9 | match ... { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1233:32:1233:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1233:32:1233:36 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1233:36:1233:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1234:13:1234:16 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1234:21:1234:38 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1234:21:1234:38 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1235:13:1235:17 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1235:22:1235:40 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1235:22:1235:40 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1235:39:1235:39 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1237:18:1237:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1237:18:1237:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1237:18:1237:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1237:18:1237:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1237:26:1237:35 | from_match |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1237:26:1237:35 | from_match | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1240:13:1240:21 | from_loop |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1240:13:1240:21 | from_loop | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1240:25:1245:9 | loop { ... } |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1240:25:1245:9 | loop { ... } | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1241:16:1241:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1241:16:1241:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1241:20:1241:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1242:23:1242:40 | ...::MyNone(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1242:23:1242:40 | ...::MyNone(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1244:19:1244:37 | ...::MySome(...) |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1244:19:1244:37 | ...::MySome(...) | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1244:36:1244:36 | S |  | main.rs:1198:5:1199:13 | S |
-| main.rs:1246:18:1246:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1246:18:1246:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1246:18:1246:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1246:18:1246:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1246:26:1246:34 | from_loop |  | main.rs:1163:5:1167:5 | MyOption |
-| main.rs:1246:26:1246:34 | from_loop | T | main.rs:1198:5:1199:13 | S |
-| main.rs:1264:15:1264:18 | SelfParam |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1264:15:1264:18 | SelfParam | T | main.rs:1263:10:1263:10 | T |
-| main.rs:1264:26:1266:9 | { ... } |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1265:13:1265:16 | self |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1265:13:1265:16 | self | T | main.rs:1263:10:1263:10 | T |
-| main.rs:1265:13:1265:18 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1268:15:1268:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1268:15:1268:19 | SelfParam | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1268:15:1268:19 | SelfParam | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1268:28:1270:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1268:28:1270:9 | { ... } | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:13:1269:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1269:13:1269:19 | &... | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:14:1269:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1269:14:1269:17 | self | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1269:14:1269:17 | self | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1269:14:1269:19 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1272:15:1272:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1272:15:1272:25 | SelfParam | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1272:15:1272:25 | SelfParam | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1272:34:1274:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1272:34:1274:9 | { ... } | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:13:1273:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1273:13:1273:19 | &... | &T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:14:1273:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1273:14:1273:17 | self | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1273:14:1273:17 | self | &T.T | main.rs:1263:10:1263:10 | T |
-| main.rs:1273:14:1273:19 | self.0 |  | main.rs:1263:10:1263:10 | T |
-| main.rs:1278:29:1278:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1278:29:1278:33 | SelfParam | &T | main.rs:1277:5:1280:5 | Self [trait ATrait] |
-| main.rs:1279:33:1279:36 | SelfParam |  | main.rs:1277:5:1280:5 | Self [trait ATrait] |
-| main.rs:1285:29:1285:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1285:29:1285:33 | SelfParam | &T | file://:0:0:0:0 | & |
-| main.rs:1285:29:1285:33 | SelfParam | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1285:29:1285:33 | SelfParam | &T.&T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1285:43:1287:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1286:13:1286:22 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:13:1286:24 | ... .a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1286:14:1286:21 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:15:1286:21 | (...) |  | file://:0:0:0:0 | & |
-| main.rs:1286:15:1286:21 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:15:1286:21 | (...) | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:16:1286:20 | * ... |  | file://:0:0:0:0 | & |
-| main.rs:1286:16:1286:20 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:16:1286:20 | * ... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:17:1286:20 | self |  | file://:0:0:0:0 | & |
-| main.rs:1286:17:1286:20 | self | &T | file://:0:0:0:0 | & |
-| main.rs:1286:17:1286:20 | self | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1286:17:1286:20 | self | &T.&T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1290:33:1290:36 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1290:33:1290:36 | SelfParam | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1290:46:1292:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:13:1291:19 | (...) |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1291:13:1291:21 | ... .a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1291:14:1291:18 | * ... |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1291:15:1291:18 | self |  | file://:0:0:0:0 | & |
-| main.rs:1291:15:1291:18 | self | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1296:13:1296:14 | x1 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1296:13:1296:14 | x1 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1296:18:1296:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1296:18:1296:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1296:20:1296:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1297:18:1297:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1297:18:1297:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1297:18:1297:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1297:18:1297:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1297:26:1297:27 | x1 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1297:26:1297:27 | x1 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1297:26:1297:32 | x1.m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:13:1299:14 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1299:13:1299:14 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:18:1299:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1299:18:1299:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1299:20:1299:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1301:18:1301:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1301:18:1301:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1301:18:1301:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1301:18:1301:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1301:26:1301:27 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1301:26:1301:27 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1301:26:1301:32 | x2.m2() |  | file://:0:0:0:0 | & |
-| main.rs:1301:26:1301:32 | x2.m2() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1302:18:1302:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1302:18:1302:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1302:18:1302:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1302:18:1302:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1302:26:1302:27 | x2 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1302:26:1302:27 | x2 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1302:26:1302:32 | x2.m3() |  | file://:0:0:0:0 | & |
-| main.rs:1302:26:1302:32 | x2.m3() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:13:1304:14 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1304:13:1304:14 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:18:1304:22 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1304:18:1304:22 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1304:20:1304:21 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:18:1306:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1306:18:1306:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1306:18:1306:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1306:18:1306:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1306:26:1306:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
-| main.rs:1306:26:1306:41 | ...::m2(...) | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:38:1306:40 | &x3 |  | file://:0:0:0:0 | & |
-| main.rs:1306:38:1306:40 | &x3 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1306:38:1306:40 | &x3 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1306:39:1306:40 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1306:39:1306:40 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:18:1307:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1307:18:1307:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1307:18:1307:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1307:18:1307:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1307:26:1307:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1307:26:1307:41 | ...::m3(...) | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:38:1307:40 | &x3 |  | file://:0:0:0:0 | & |
-| main.rs:1307:38:1307:40 | &x3 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1307:38:1307:40 | &x3 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1307:39:1307:40 | x3 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1307:39:1307:40 | x3 | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:13:1309:14 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1309:13:1309:14 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:13:1309:14 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:18:1309:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1309:18:1309:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:18:1309:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:19:1309:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1309:19:1309:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1309:21:1309:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1311:18:1311:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1311:18:1311:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1311:18:1311:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1311:18:1311:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1311:26:1311:27 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1311:26:1311:27 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1311:26:1311:27 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1311:26:1311:32 | x4.m2() |  | file://:0:0:0:0 | & |
-| main.rs:1311:26:1311:32 | x4.m2() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1312:18:1312:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1312:18:1312:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1312:18:1312:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1312:18:1312:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1312:26:1312:27 | x4 |  | file://:0:0:0:0 | & |
-| main.rs:1312:26:1312:27 | x4 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1312:26:1312:27 | x4 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1312:26:1312:32 | x4.m3() |  | file://:0:0:0:0 | & |
-| main.rs:1312:26:1312:32 | x4.m3() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:13:1314:14 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1314:13:1314:14 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:13:1314:14 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:18:1314:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1314:18:1314:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:18:1314:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:19:1314:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1314:19:1314:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1314:21:1314:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1316:18:1316:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1316:18:1316:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1316:18:1316:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1316:18:1316:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1316:26:1316:27 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1316:26:1316:27 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1316:26:1316:27 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1316:26:1316:32 | x5.m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1317:18:1317:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1317:18:1317:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1317:18:1317:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1317:18:1317:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1317:26:1317:27 | x5 |  | file://:0:0:0:0 | & |
-| main.rs:1317:26:1317:27 | x5 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1317:26:1317:27 | x5 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1317:26:1317:29 | x5.0 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:13:1319:14 | x6 |  | file://:0:0:0:0 | & |
-| main.rs:1319:13:1319:14 | x6 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:13:1319:14 | x6 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:18:1319:23 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1319:18:1319:23 | &... | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:18:1319:23 | &... | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:19:1319:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1319:19:1319:23 | S(...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1319:21:1319:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:18:1322:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1322:18:1322:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1322:18:1322:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1322:18:1322:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1322:26:1322:30 | (...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:26:1322:30 | (...) | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:26:1322:35 | ... .m1() |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:27:1322:29 | * ... |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:27:1322:29 | * ... | T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1322:28:1322:29 | x6 |  | file://:0:0:0:0 | & |
-| main.rs:1322:28:1322:29 | x6 | &T | main.rs:1252:5:1253:19 | S |
-| main.rs:1322:28:1322:29 | x6 | &T.T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:13:1324:14 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1324:13:1324:14 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1324:13:1324:14 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:18:1324:23 | S(...) |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1324:18:1324:23 | S(...) | T | file://:0:0:0:0 | & |
-| main.rs:1324:18:1324:23 | S(...) | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:20:1324:22 | &S2 |  | file://:0:0:0:0 | & |
-| main.rs:1324:20:1324:22 | &S2 | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1324:21:1324:22 | S2 |  | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:13:1327:13 | t |  | file://:0:0:0:0 | & |
-| main.rs:1327:13:1327:13 | t | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:17:1327:18 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1327:17:1327:18 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1327:17:1327:18 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1327:17:1327:23 | x7.m1() |  | file://:0:0:0:0 | & |
-| main.rs:1327:17:1327:23 | x7.m1() | &T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1328:18:1328:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1328:18:1328:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1328:18:1328:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1328:18:1328:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1328:26:1328:27 | x7 |  | main.rs:1252:5:1253:19 | S |
-| main.rs:1328:26:1328:27 | x7 | T | file://:0:0:0:0 | & |
-| main.rs:1328:26:1328:27 | x7 | T.&T | main.rs:1255:5:1256:14 | S2 |
-| main.rs:1330:13:1330:14 | x9 |  | {EXTERNAL LOCATION} | String |
-| main.rs:1330:26:1330:32 | "Hello" |  | file://:0:0:0:0 | & |
-| main.rs:1330:26:1330:32 | "Hello" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1330:26:1330:44 | "Hello".to_string() |  | {EXTERNAL LOCATION} | String |
-| main.rs:1334:13:1334:13 | u |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1334:13:1334:13 | u | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:1334:17:1334:18 | x9 |  | {EXTERNAL LOCATION} | String |
-| main.rs:1334:17:1334:33 | x9.parse() |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1334:17:1334:33 | x9.parse() | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:1336:13:1336:20 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1336:13:1336:20 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:24:1336:39 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1336:24:1336:39 | &... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:25:1336:39 | MyInt {...} |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1336:36:1336:37 | 37 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1336:36:1336:37 | 37 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1338:17:1338:24 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1338:17:1338:24 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1339:18:1339:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1339:18:1339:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1339:18:1339:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1339:18:1339:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1342:13:1342:20 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1342:13:1342:20 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:24:1342:39 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1342:24:1342:39 | &... | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:25:1342:39 | MyInt {...} |  | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1342:36:1342:37 | 38 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1342:36:1342:37 | 38 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1343:17:1343:24 | my_thing |  | file://:0:0:0:0 | & |
-| main.rs:1343:17:1343:24 | my_thing | &T | main.rs:1258:5:1261:5 | MyInt |
-| main.rs:1344:18:1344:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1344:18:1344:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1344:18:1344:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1344:18:1344:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1351:16:1351:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1351:16:1351:20 | SelfParam | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1354:16:1354:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1354:16:1354:20 | SelfParam | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1354:32:1356:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1354:32:1356:9 | { ... } | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1355:13:1355:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1355:13:1355:16 | self | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1355:13:1355:22 | self.foo() |  | file://:0:0:0:0 | & |
-| main.rs:1355:13:1355:22 | self.foo() | &T | main.rs:1349:5:1357:5 | Self [trait MyTrait] |
-| main.rs:1363:16:1363:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1363:16:1363:20 | SelfParam | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1363:36:1365:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1363:36:1365:9 | { ... } | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1364:13:1364:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1364:13:1364:16 | self | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1369:13:1369:13 | x |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1369:17:1369:24 | MyStruct |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1370:9:1370:9 | x |  | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1370:9:1370:15 | x.bar() |  | file://:0:0:0:0 | & |
-| main.rs:1370:9:1370:15 | x.bar() | &T | main.rs:1359:5:1359:20 | MyStruct |
-| main.rs:1380:16:1380:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1380:16:1380:20 | SelfParam | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1380:16:1380:20 | SelfParam | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1380:32:1382:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1380:32:1382:9 | { ... } | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1380:32:1382:9 | { ... } | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1381:13:1381:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1381:13:1381:16 | self | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1381:13:1381:16 | self | &T.T | main.rs:1379:10:1379:10 | T |
-| main.rs:1386:13:1386:13 | x |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1386:13:1386:13 | x | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1386:17:1386:27 | MyStruct(...) |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1386:17:1386:27 | MyStruct(...) | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1386:26:1386:26 | S |  | main.rs:1375:5:1375:13 | S |
-| main.rs:1387:9:1387:9 | x |  | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1387:9:1387:9 | x | T | main.rs:1375:5:1375:13 | S |
-| main.rs:1387:9:1387:15 | x.foo() |  | file://:0:0:0:0 | & |
-| main.rs:1387:9:1387:15 | x.foo() | &T | main.rs:1377:5:1377:26 | MyStruct |
-| main.rs:1387:9:1387:15 | x.foo() | &T.T | main.rs:1375:5:1375:13 | S |
-| main.rs:1398:17:1398:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1398:17:1398:25 | SelfParam | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:13:1399:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1399:13:1399:16 | self | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:13:1399:21 | self.bool |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1399:13:1399:34 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1399:25:1399:34 | ! ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1399:26:1399:29 | self |  | file://:0:0:0:0 | & |
-| main.rs:1399:26:1399:29 | self | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1399:26:1399:34 | self.bool |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1406:15:1406:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1406:15:1406:19 | SelfParam | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1406:31:1408:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1406:31:1408:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:13:1407:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:13:1407:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:13:1407:19 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:14:1407:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:14:1407:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1407:14:1407:19 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:15:1407:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1407:15:1407:19 | &self | &T | file://:0:0:0:0 | & |
-| main.rs:1407:15:1407:19 | &self | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1407:16:1407:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1407:16:1407:19 | self | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1410:15:1410:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1410:15:1410:25 | SelfParam | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1410:37:1412:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1410:37:1412:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:13:1411:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:13:1411:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:13:1411:19 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:14:1411:19 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:14:1411:19 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1411:14:1411:19 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:15:1411:19 | &self |  | file://:0:0:0:0 | & |
-| main.rs:1411:15:1411:19 | &self | &T | file://:0:0:0:0 | & |
-| main.rs:1411:15:1411:19 | &self | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1411:16:1411:19 | self |  | file://:0:0:0:0 | & |
-| main.rs:1411:16:1411:19 | self | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1414:15:1414:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1414:15:1414:15 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1414:34:1416:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1414:34:1416:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1415:13:1415:13 | x |  | file://:0:0:0:0 | & |
-| main.rs:1415:13:1415:13 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1418:15:1418:15 | x |  | file://:0:0:0:0 | & |
-| main.rs:1418:15:1418:15 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1418:34:1420:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:1418:34:1420:9 | { ... } | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:13:1419:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:13:1419:16 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T.&T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:13:1419:16 | &... | &T.&T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:14:1419:16 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:14:1419:16 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... | &T.&T | file://:0:0:0:0 | & |
-| main.rs:1419:14:1419:16 | &... | &T.&T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:15:1419:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1419:15:1419:16 | &x | &T | file://:0:0:0:0 | & |
-| main.rs:1419:15:1419:16 | &x | &T.&T | main.rs:1403:5:1403:13 | S |
-| main.rs:1419:16:1419:16 | x |  | file://:0:0:0:0 | & |
-| main.rs:1419:16:1419:16 | x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1424:13:1424:13 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1424:17:1424:20 | S {...} |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1425:9:1425:9 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1425:9:1425:14 | x.f1() |  | file://:0:0:0:0 | & |
-| main.rs:1425:9:1425:14 | x.f1() | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1426:9:1426:9 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1426:9:1426:14 | x.f2() |  | file://:0:0:0:0 | & |
-| main.rs:1426:9:1426:14 | x.f2() | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:9:1427:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1427:9:1427:17 | ...::f3(...) | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:15:1427:16 | &x |  | file://:0:0:0:0 | & |
-| main.rs:1427:15:1427:16 | &x | &T | main.rs:1403:5:1403:13 | S |
-| main.rs:1427:16:1427:16 | x |  | main.rs:1403:5:1403:13 | S |
-| main.rs:1429:13:1429:13 | n |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:17:1429:24 | * ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:18:1429:24 | * ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:18:1429:24 | * ... |  | file://:0:0:0:0 | & |
-| main.rs:1429:18:1429:24 | * ... | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:19:1429:24 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1429:19:1429:24 | &... | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:19:1429:24 | &... | &T | file://:0:0:0:0 | & |
-| main.rs:1429:19:1429:24 | &... | &T.&T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:20:1429:24 | &true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:20:1429:24 | &true |  | file://:0:0:0:0 | & |
-| main.rs:1429:20:1429:24 | &true | &T | {EXTERNAL LOCATION} | bool |
-| main.rs:1429:21:1429:24 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1433:17:1433:20 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1433:24:1433:41 | ...::default(...) |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1434:22:1434:30 | &mut flag |  | file://:0:0:0:0 | & |
-| main.rs:1434:22:1434:30 | &mut flag | &T | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1434:27:1434:30 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1435:18:1435:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1435:18:1435:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1435:18:1435:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1435:18:1435:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1435:26:1435:29 | flag |  | main.rs:1392:5:1395:5 | MyFlag |
-| main.rs:1450:43:1453:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1450:43:1453:5 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1450:43:1453:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:13:1451:13 | x |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:17:1451:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1451:17:1451:30 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:17:1451:31 | TryExpr |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1451:28:1451:29 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:9:1452:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1452:9:1452:22 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:9:1452:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1452:20:1452:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1457:46:1461:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1457:46:1461:5 | { ... } | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1457:46:1461:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:13:1458:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1458:13:1458:13 | x | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:17:1458:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1458:17:1458:30 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1458:28:1458:29 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:13:1459:13 | y |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:17:1459:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1459:17:1459:17 | x | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1459:17:1459:18 | TryExpr |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1460:9:1460:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1460:9:1460:22 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1460:9:1460:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1460:20:1460:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1465:40:1470:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1465:40:1470:5 | { ... } | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1465:40:1470:5 | { ... } | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:13:1466:13 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:13:1466:13 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:13:1466:13 | x | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:17:1466:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:17:1466:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:17:1466:42 | ...::Ok(...) | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:28:1466:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1466:28:1466:41 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1466:39:1466:40 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:17 | x |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:17 | x | T | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:17 | x | T.T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:17:1468:18 | TryExpr | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1468:17:1468:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1468:24:1468:28 | \|...\| s |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:1468:24:1468:28 | \|...\| s | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:1469:9:1469:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1469:9:1469:22 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1469:9:1469:22 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1469:20:1469:21 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:30:1474:34 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1474:30:1474:34 | input | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:30:1474:34 | input | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1474:69:1481:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1474:69:1481:5 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1474:69:1481:5 | { ... } | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:13:1475:17 | value |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:21:1475:25 | input |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1475:21:1475:25 | input | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1475:21:1475:25 | input | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1475:21:1475:26 | TryExpr |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:22:1476:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:22:1476:38 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:22:1476:38 | ...::Ok(...) | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:22:1479:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:22:1479:10 | ... .and_then(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:33:1476:37 | value |  | main.rs:1474:20:1474:27 | T |
-| main.rs:1476:49:1479:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:49:1479:9 | \|...\| ... | dyn(Output).E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1476:53:1479:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1476:53:1479:9 | { ... } | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1477:22:1477:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1477:22:1477:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1477:22:1477:30 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1477:22:1477:30 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1478:13:1478:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1478:13:1478:34 | ...::Ok::<...>(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1480:9:1480:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1480:9:1480:23 | ...::Err(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1480:9:1480:23 | ...::Err(...) | T | main.rs:1474:20:1474:27 | T |
-| main.rs:1480:21:1480:22 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:16:1485:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1485:16:1485:33 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:16:1485:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:27:1485:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:37:1485:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1485:37:1485:52 | try_same_error(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1485:37:1485:52 | try_same_error(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1486:22:1486:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1486:22:1486:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1486:22:1486:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1486:22:1486:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1486:30:1486:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:16:1489:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1489:16:1489:33 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1489:16:1489:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:27:1489:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1489:37:1489:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1489:37:1489:55 | try_convert_error(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1489:37:1489:55 | try_convert_error(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1490:22:1490:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1490:22:1490:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1490:22:1490:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1490:22:1490:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1490:30:1490:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:16:1493:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1493:16:1493:33 | ...::Ok(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1493:16:1493:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:27:1493:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1493:37:1493:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1493:37:1493:49 | try_chained(...) | E | main.rs:1445:5:1446:14 | S2 |
-| main.rs:1493:37:1493:49 | try_chained(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1494:22:1494:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1494:22:1494:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1494:22:1494:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1494:22:1494:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1494:30:1494:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:16:1497:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:16:1497:33 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:16:1497:33 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:27:1497:32 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:37:1497:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:37:1497:63 | try_complex(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:37:1497:63 | try_complex(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:49:1497:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:1497:49:1497:62 | ...::Ok(...) | E | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:49:1497:62 | ...::Ok(...) | T | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1497:60:1497:61 | S1 |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1498:22:1498:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:1498:22:1498:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1498:22:1498:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1498:22:1498:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:1498:30:1498:35 | result |  | main.rs:1442:5:1443:14 | S1 |
-| main.rs:1505:13:1505:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1505:22:1505:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1506:13:1506:13 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1506:17:1506:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:13:1507:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:17:1507:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:17:1507:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1507:21:1507:21 | y |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:13:1508:13 | z |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:17:1508:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1508:17:1508:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1509:13:1509:13 | c |  | {EXTERNAL LOCATION} | char |
-| main.rs:1509:17:1509:19 | 'c' |  | {EXTERNAL LOCATION} | char |
-| main.rs:1510:13:1510:17 | hello |  | file://:0:0:0:0 | & |
-| main.rs:1510:13:1510:17 | hello | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1510:21:1510:27 | "Hello" |  | file://:0:0:0:0 | & |
-| main.rs:1510:21:1510:27 | "Hello" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:1511:13:1511:13 | f |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1511:17:1511:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
-| main.rs:1512:13:1512:13 | t |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1512:17:1512:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:13:1513:13 | f |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1513:17:1513:21 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:13:1520:13 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:17:1520:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:17:1520:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1520:25:1520:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:13:1521:13 | y |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:17:1521:20 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:17:1521:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1521:25:1521:29 | false |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1523:17:1523:17 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1524:13:1524:16 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1524:20:1524:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1524:20:1524:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1524:26:1524:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1525:12:1525:15 | cond |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1526:17:1526:17 | z |  | file://:0:0:0:0 | () |
-| main.rs:1526:21:1526:27 | (...) |  | file://:0:0:0:0 | () |
-| main.rs:1526:22:1526:22 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1526:22:1526:26 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1526:26:1526:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1528:13:1528:13 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1528:13:1528:17 | ... = ... |  | file://:0:0:0:0 | () |
-| main.rs:1528:17:1528:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1530:9:1530:9 | a |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1544:30:1546:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1545:13:1545:31 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1545:23:1545:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1545:23:1545:23 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1545:29:1545:29 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1545:29:1545:29 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1552:16:1552:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1552:22:1552:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1552:41:1557:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1553:13:1556:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:20:1554:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:20:1554:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:20:1554:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1554:29:1554:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1554:29:1554:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:20:1555:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1555:20:1555:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:20:1555:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1555:29:1555:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1555:29:1555:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1562:23:1562:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1562:23:1562:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1562:34:1562:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:13:1563:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1563:13:1563:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:13:1563:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1563:13:1563:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1563:23:1563:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1563:23:1563:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:13:1564:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1564:13:1564:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1564:13:1564:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1564:13:1564:27 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1564:23:1564:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1564:23:1564:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1570:16:1570:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1570:22:1570:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1570:41:1575:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1571:13:1574:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:20:1572:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:20:1572:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1572:20:1572:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1572:29:1572:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1572:29:1572:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:20:1573:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1573:20:1573:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:20:1573:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1573:29:1573:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1573:29:1573:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1580:23:1580:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1580:23:1580:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1580:34:1580:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:13:1581:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1581:13:1581:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:13:1581:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1581:13:1581:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1581:23:1581:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1581:23:1581:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1582:13:1582:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1582:13:1582:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1582:13:1582:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1582:13:1582:27 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1582:23:1582:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1582:23:1582:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1588:16:1588:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1588:22:1588:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1588:41:1593:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1589:13:1592:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:20:1590:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:20:1590:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1590:20:1590:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1590:29:1590:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1590:29:1590:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:20:1591:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1591:20:1591:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:20:1591:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1591:29:1591:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1591:29:1591:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1597:23:1597:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1597:23:1597:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1597:34:1597:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:13:1598:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1598:13:1598:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:13:1598:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1598:13:1598:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1598:23:1598:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1598:23:1598:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1599:13:1599:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1599:13:1599:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1599:13:1599:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1599:13:1599:27 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1599:23:1599:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1599:23:1599:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1605:16:1605:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1605:22:1605:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1605:41:1610:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1606:13:1609:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:20:1607:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:20:1607:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1607:20:1607:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1607:29:1607:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1607:29:1607:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:20:1608:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1608:20:1608:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:20:1608:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1608:29:1608:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1608:29:1608:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1614:23:1614:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1614:23:1614:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1614:34:1614:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:13:1615:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1615:13:1615:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:13:1615:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1615:13:1615:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1615:23:1615:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1615:23:1615:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1616:13:1616:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1616:13:1616:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1616:13:1616:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1616:13:1616:27 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1616:23:1616:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1616:23:1616:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1622:16:1622:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1622:22:1622:24 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1622:41:1627:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1623:13:1626:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:20:1624:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:20:1624:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1624:20:1624:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1624:29:1624:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1624:29:1624:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:20:1625:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1625:20:1625:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:20:1625:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1625:29:1625:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1625:29:1625:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1631:23:1631:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1631:23:1631:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1631:34:1631:36 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:13:1632:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1632:13:1632:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:13:1632:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1632:13:1632:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1632:23:1632:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1632:23:1632:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1633:13:1633:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1633:13:1633:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1633:13:1633:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1633:13:1633:27 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1633:23:1633:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1633:23:1633:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1639:19:1639:22 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1639:25:1639:27 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1639:44:1644:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1640:13:1643:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:20:1641:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:20:1641:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1641:20:1641:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1641:29:1641:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1641:29:1641:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:20:1642:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1642:20:1642:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:20:1642:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1642:29:1642:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1642:29:1642:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1648:26:1648:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1648:26:1648:34 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1648:37:1648:39 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:13:1649:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1649:13:1649:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:13:1649:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1649:13:1649:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1649:23:1649:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1649:23:1649:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1650:13:1650:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1650:13:1650:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1650:13:1650:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1650:13:1650:27 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1650:23:1650:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1650:23:1650:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1656:18:1656:21 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1656:24:1656:26 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1656:43:1661:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1657:13:1660:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:20:1658:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:20:1658:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1658:20:1658:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1658:29:1658:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1658:29:1658:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:20:1659:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1659:20:1659:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:20:1659:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1659:29:1659:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1659:29:1659:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1665:25:1665:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1665:25:1665:33 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1665:36:1665:38 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:13:1666:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1666:13:1666:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:13:1666:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1666:13:1666:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1666:23:1666:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1666:23:1666:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1667:13:1667:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1667:13:1667:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1667:13:1667:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1667:13:1667:27 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1667:23:1667:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1667:23:1667:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1673:19:1673:22 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1673:25:1673:27 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1673:44:1678:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1674:13:1677:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:20:1675:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:20:1675:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1675:20:1675:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1675:29:1675:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1675:29:1675:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:20:1676:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1676:20:1676:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:20:1676:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1676:29:1676:31 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1676:29:1676:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1682:26:1682:34 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1682:26:1682:34 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1682:37:1682:39 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:13:1683:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1683:13:1683:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:13:1683:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1683:13:1683:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1683:23:1683:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1683:23:1683:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1684:13:1684:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1684:13:1684:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1684:13:1684:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1684:13:1684:27 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1684:23:1684:25 | rhs |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1684:23:1684:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1690:16:1690:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1690:22:1690:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1690:40:1695:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1691:13:1694:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1692:20:1692:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1692:20:1692:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1692:20:1692:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1692:30:1692:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1693:20:1693:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1693:20:1693:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1693:20:1693:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1693:30:1693:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1699:23:1699:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1699:23:1699:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1699:34:1699:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1700:13:1700:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1700:13:1700:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1700:13:1700:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1700:13:1700:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1700:24:1700:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1701:13:1701:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1701:13:1701:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1701:13:1701:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1701:13:1701:26 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1701:24:1701:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1707:16:1707:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1707:22:1707:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1707:40:1712:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1708:13:1711:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1709:20:1709:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1709:20:1709:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1709:20:1709:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1709:30:1709:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1710:20:1710:23 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1710:20:1710:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1710:20:1710:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1710:30:1710:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1716:23:1716:31 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1716:23:1716:31 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1716:34:1716:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1717:13:1717:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1717:13:1717:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1717:13:1717:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1717:13:1717:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1717:24:1717:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1718:13:1718:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1718:13:1718:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1718:13:1718:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1718:13:1718:26 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1718:24:1718:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1724:16:1724:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1724:30:1729:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1725:13:1728:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1726:20:1726:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1726:21:1726:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1726:21:1726:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1727:20:1727:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1727:21:1727:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1727:21:1727:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1734:16:1734:19 | SelfParam |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1734:30:1739:9 | { ... } |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1735:13:1738:13 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1736:20:1736:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1736:21:1736:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1736:21:1736:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1737:20:1737:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1737:21:1737:24 | self |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1737:21:1737:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1743:15:1743:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1743:15:1743:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1743:22:1743:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1743:22:1743:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1743:44:1745:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:13:1744:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1744:13:1744:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:13:1744:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:13:1744:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:13:1744:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:23:1744:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1744:23:1744:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:23:1744:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:34:1744:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1744:34:1744:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:34:1744:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1744:34:1744:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1744:44:1744:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1744:44:1744:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1744:44:1744:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1747:15:1747:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1747:15:1747:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1747:22:1747:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1747:22:1747:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1747:44:1749:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:13:1748:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1748:13:1748:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:13:1748:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:13:1748:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:13:1748:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:23:1748:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1748:23:1748:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:23:1748:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:34:1748:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1748:34:1748:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:34:1748:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1748:34:1748:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1748:44:1748:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1748:44:1748:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1748:44:1748:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1753:24:1753:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1753:24:1753:28 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1753:31:1753:35 | other |  | file://:0:0:0:0 | & |
-| main.rs:1753:31:1753:35 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1753:75:1755:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1753:75:1755:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1754:13:1754:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:13:1754:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:1754:13:1754:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
-| main.rs:1754:14:1754:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:1754:14:1754:17 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:14:1754:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:14:1754:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:23:1754:26 | self |  | file://:0:0:0:0 | & |
-| main.rs:1754:23:1754:26 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:23:1754:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:43:1754:62 | &... |  | file://:0:0:0:0 | & |
-| main.rs:1754:43:1754:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:44:1754:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:45:1754:49 | other |  | file://:0:0:0:0 | & |
-| main.rs:1754:45:1754:49 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:45:1754:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:45:1754:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1754:55:1754:59 | other |  | file://:0:0:0:0 | & |
-| main.rs:1754:55:1754:59 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1754:55:1754:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1757:15:1757:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1757:15:1757:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1757:22:1757:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1757:22:1757:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1757:44:1759:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:13:1758:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1758:13:1758:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:13:1758:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:13:1758:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:13:1758:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:22:1758:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1758:22:1758:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:22:1758:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:33:1758:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1758:33:1758:36 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:33:1758:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1758:33:1758:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1758:42:1758:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1758:42:1758:46 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1758:42:1758:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1761:15:1761:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1761:15:1761:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1761:22:1761:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1761:22:1761:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1761:44:1763:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:13:1762:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1762:13:1762:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:13:1762:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:13:1762:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:13:1762:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:23:1762:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1762:23:1762:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:23:1762:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:34:1762:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1762:34:1762:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:34:1762:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1762:34:1762:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1762:44:1762:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1762:44:1762:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1762:44:1762:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1765:15:1765:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1765:15:1765:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1765:22:1765:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1765:22:1765:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1765:44:1767:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1056:18:1056:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1056:18:1056:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1056:26:1056:26 | y |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1056:26:1056:26 | y | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1056:26:1056:31 | y.m3() |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1058:13:1058:13 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1058:13:1058:13 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1058:17:1058:33 | MyThing {...} |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1058:17:1058:33 | MyThing {...} | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1058:30:1058:31 | S1 |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1059:13:1059:13 | s |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1059:17:1059:32 | call_trait_m1(...) |  | main.rs:971:5:972:14 | S1 |
+| main.rs:1059:31:1059:31 | x |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1059:31:1059:31 | x | A | main.rs:971:5:972:14 | S1 |
+| main.rs:1061:13:1061:13 | x |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1061:13:1061:13 | x | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1061:17:1061:34 | MyThing2 {...} |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1061:17:1061:34 | MyThing2 {...} | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1061:31:1061:32 | S2 |  | main.rs:973:5:974:14 | S2 |
+| main.rs:1062:13:1062:13 | s |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1062:13:1062:13 | s | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1062:17:1062:32 | call_trait_m1(...) |  | main.rs:961:5:964:5 | MyThing |
+| main.rs:1062:17:1062:32 | call_trait_m1(...) | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1062:31:1062:31 | x |  | main.rs:966:5:969:5 | MyThing2 |
+| main.rs:1062:31:1062:31 | x | A | main.rs:973:5:974:14 | S2 |
+| main.rs:1079:22:1079:22 | x |  | file://:0:0:0:0 | & |
+| main.rs:1079:22:1079:22 | x | &T | main.rs:1079:11:1079:19 | T |
+| main.rs:1079:35:1081:5 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1079:35:1081:5 | { ... } | &T | main.rs:1079:11:1079:19 | T |
+| main.rs:1080:9:1080:9 | x |  | file://:0:0:0:0 | & |
+| main.rs:1080:9:1080:9 | x | &T | main.rs:1079:11:1079:19 | T |
+| main.rs:1084:17:1084:20 | SelfParam |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1084:29:1086:9 | { ... } |  | main.rs:1072:5:1073:14 | S2 |
+| main.rs:1085:13:1085:14 | S2 |  | main.rs:1072:5:1073:14 | S2 |
+| main.rs:1089:21:1089:21 | x |  | main.rs:1089:13:1089:14 | T1 |
+| main.rs:1092:5:1094:5 | { ... } |  | main.rs:1089:17:1089:18 | T2 |
+| main.rs:1093:9:1093:9 | x |  | main.rs:1089:13:1089:14 | T1 |
+| main.rs:1093:9:1093:16 | x.into() |  | main.rs:1089:17:1089:18 | T2 |
+| main.rs:1097:13:1097:13 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1097:17:1097:18 | S1 |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1098:18:1098:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1098:18:1098:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1098:18:1098:31 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1098:18:1098:31 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1098:26:1098:31 | id(...) |  | file://:0:0:0:0 | & |
+| main.rs:1098:26:1098:31 | id(...) | &T | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1098:29:1098:30 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1098:29:1098:30 | &x | &T | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1098:30:1098:30 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1100:13:1100:13 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1100:17:1100:18 | S1 |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1101:18:1101:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1101:18:1101:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1101:18:1101:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1101:18:1101:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1101:26:1101:37 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:1101:26:1101:37 | id::<...>(...) | &T | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1101:35:1101:36 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1101:35:1101:36 | &x | &T | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1101:36:1101:36 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1103:13:1103:13 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1103:13:1103:13 | x |  | main.rs:1075:5:1075:25 | dyn Trait |
+| main.rs:1103:17:1103:18 | S1 |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1103:17:1103:18 | S1 |  | main.rs:1075:5:1075:25 | dyn Trait |
+| main.rs:1105:18:1105:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1105:18:1105:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1105:18:1105:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1105:18:1105:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1105:26:1105:44 | id::<...>(...) |  | file://:0:0:0:0 | & |
+| main.rs:1105:26:1105:44 | id::<...>(...) | &T | main.rs:1075:5:1075:25 | dyn Trait |
+| main.rs:1105:42:1105:43 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1105:42:1105:43 | &x | &T | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1105:42:1105:43 | &x | &T | main.rs:1075:5:1075:25 | dyn Trait |
+| main.rs:1105:43:1105:43 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1105:43:1105:43 | x |  | main.rs:1075:5:1075:25 | dyn Trait |
+| main.rs:1107:13:1107:13 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1107:17:1107:18 | S1 |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1108:9:1108:25 | into::<...>(...) |  | main.rs:1072:5:1073:14 | S2 |
+| main.rs:1108:24:1108:24 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1110:13:1110:13 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1110:17:1110:18 | S1 |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1111:13:1111:13 | y |  | main.rs:1072:5:1073:14 | S2 |
+| main.rs:1111:21:1111:27 | into(...) |  | main.rs:1072:5:1073:14 | S2 |
+| main.rs:1111:26:1111:26 | x |  | main.rs:1069:5:1070:14 | S1 |
+| main.rs:1125:22:1125:25 | SelfParam |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1125:22:1125:25 | SelfParam | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1125:22:1125:25 | SelfParam | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1125:35:1132:9 | { ... } |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1126:13:1131:13 | match self { ... } |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1126:19:1126:22 | self |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1126:19:1126:22 | self | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1126:19:1126:22 | self | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1127:17:1127:38 | ...::PairNone(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1127:17:1127:38 | ...::PairNone(...) | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1127:17:1127:38 | ...::PairNone(...) | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1127:43:1127:82 | MacroExpr |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1127:50:1127:81 | "PairNone has no second elemen... |  | file://:0:0:0:0 | & |
+| main.rs:1127:50:1127:81 | "PairNone has no second elemen... | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1127:50:1127:81 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1127:50:1127:81 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1127:50:1127:81 | MacroExpr |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1127:50:1127:81 | { ... } |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1128:17:1128:38 | ...::PairFst(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1128:17:1128:38 | ...::PairFst(...) | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1128:17:1128:38 | ...::PairFst(...) | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1128:37:1128:37 | _ |  | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1128:43:1128:81 | MacroExpr |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1128:50:1128:80 | "PairFst has no second element... |  | file://:0:0:0:0 | & |
+| main.rs:1128:50:1128:80 | "PairFst has no second element... | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1128:50:1128:80 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1128:50:1128:80 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1128:50:1128:80 | MacroExpr |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1128:50:1128:80 | { ... } |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1129:17:1129:40 | ...::PairSnd(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1129:17:1129:40 | ...::PairSnd(...) | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1129:17:1129:40 | ...::PairSnd(...) | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1129:37:1129:39 | snd |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1129:45:1129:47 | snd |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1130:17:1130:44 | ...::PairBoth(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1130:17:1130:44 | ...::PairBoth(...) | Fst | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1130:17:1130:44 | ...::PairBoth(...) | Snd | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1130:38:1130:38 | _ |  | main.rs:1124:10:1124:12 | Fst |
+| main.rs:1130:41:1130:43 | snd |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1130:49:1130:51 | snd |  | main.rs:1124:15:1124:17 | Snd |
+| main.rs:1156:10:1156:10 | t |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1156:10:1156:10 | t | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1156:10:1156:10 | t | Snd | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1156:10:1156:10 | t | Snd.Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1156:10:1156:10 | t | Snd.Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1157:13:1157:13 | x |  | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1157:17:1157:17 | t |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1157:17:1157:17 | t | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1157:17:1157:17 | t | Snd | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1157:17:1157:17 | t | Snd.Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1157:17:1157:17 | t | Snd.Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1157:17:1157:29 | t.unwrapSnd() |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1157:17:1157:29 | t.unwrapSnd() | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1157:17:1157:29 | t.unwrapSnd() | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1157:17:1157:41 | ... .unwrapSnd() |  | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1158:18:1158:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1158:18:1158:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1158:18:1158:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1158:18:1158:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1158:26:1158:26 | x |  | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1173:22:1173:25 | SelfParam |  | main.rs:1171:5:1174:5 | Self [trait TraitWithAssocType] |
+| main.rs:1181:22:1181:25 | SelfParam |  | main.rs:1169:5:1169:28 | GenS |
+| main.rs:1181:22:1181:25 | SelfParam | GenT | main.rs:1176:10:1176:15 | Output |
+| main.rs:1181:44:1183:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1181:44:1183:9 | { ... } | E | main.rs:1176:10:1176:15 | Output |
+| main.rs:1181:44:1183:9 | { ... } | T | main.rs:1176:10:1176:15 | Output |
+| main.rs:1182:13:1182:22 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1182:13:1182:22 | Ok(...) | E | main.rs:1176:10:1176:15 | Output |
+| main.rs:1182:13:1182:22 | Ok(...) | T | main.rs:1176:10:1176:15 | Output |
+| main.rs:1182:16:1182:19 | self |  | main.rs:1169:5:1169:28 | GenS |
+| main.rs:1182:16:1182:19 | self | GenT | main.rs:1176:10:1176:15 | Output |
+| main.rs:1182:16:1182:21 | self.0 |  | main.rs:1176:10:1176:15 | Output |
+| main.rs:1188:13:1188:14 | p1 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1188:13:1188:14 | p1 | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1188:13:1188:14 | p1 | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1188:26:1188:53 | ...::PairBoth(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1188:26:1188:53 | ...::PairBoth(...) | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1188:26:1188:53 | ...::PairBoth(...) | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1188:47:1188:48 | S1 |  | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1188:51:1188:52 | S2 |  | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1189:18:1189:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1189:18:1189:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1189:18:1189:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1189:18:1189:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1189:26:1189:27 | p1 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1189:26:1189:27 | p1 | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1189:26:1189:27 | p1 | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1192:13:1192:14 | p2 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1192:13:1192:14 | p2 | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1192:13:1192:14 | p2 | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1192:26:1192:47 | ...::PairNone(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1192:26:1192:47 | ...::PairNone(...) | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1192:26:1192:47 | ...::PairNone(...) | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1193:18:1193:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1193:18:1193:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1193:18:1193:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1193:18:1193:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1193:26:1193:27 | p2 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1193:26:1193:27 | p2 | Fst | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1193:26:1193:27 | p2 | Snd | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1196:13:1196:14 | p3 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1196:13:1196:14 | p3 | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1196:13:1196:14 | p3 | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1196:34:1196:56 | ...::PairSnd(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1196:34:1196:56 | ...::PairSnd(...) | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1196:34:1196:56 | ...::PairSnd(...) | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1196:54:1196:55 | S3 |  | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1197:18:1197:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1197:18:1197:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1197:18:1197:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1197:18:1197:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1197:26:1197:27 | p3 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1197:26:1197:27 | p3 | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1197:26:1197:27 | p3 | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1200:13:1200:14 | p3 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1200:13:1200:14 | p3 | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1200:13:1200:14 | p3 | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1200:35:1200:56 | ...::PairNone(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1200:35:1200:56 | ...::PairNone(...) | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1200:35:1200:56 | ...::PairNone(...) | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1201:18:1201:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1201:18:1201:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1201:18:1201:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1201:18:1201:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1201:26:1201:27 | p3 |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1201:26:1201:27 | p3 | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1201:26:1201:27 | p3 | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1203:11:1203:54 | ...::PairSnd(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1203:11:1203:54 | ...::PairSnd(...) | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1203:11:1203:54 | ...::PairSnd(...) | Snd | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1203:11:1203:54 | ...::PairSnd(...) | Snd.Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1203:11:1203:54 | ...::PairSnd(...) | Snd.Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1203:31:1203:53 | ...::PairSnd(...) |  | main.rs:1116:5:1122:5 | PairOption |
+| main.rs:1203:31:1203:53 | ...::PairSnd(...) | Fst | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1203:31:1203:53 | ...::PairSnd(...) | Snd | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1203:51:1203:52 | S3 |  | main.rs:1141:5:1142:14 | S3 |
+| main.rs:1205:13:1205:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1205:13:1205:13 | x | E | main.rs:1135:5:1136:14 | S1 |
+| main.rs:1205:13:1205:13 | x | T | main.rs:1161:5:1161:34 | S4 |
+| main.rs:1205:13:1205:13 | x | T.T41 | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1205:13:1205:13 | x | T.T42 | main.rs:1163:5:1163:22 | S5 |
+| main.rs:1205:13:1205:13 | x | T.T42.T5 | main.rs:1138:5:1139:14 | S2 |
+| main.rs:1207:13:1207:13 | y |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1207:13:1207:13 | y | E | {EXTERNAL LOCATION} | bool |
+| main.rs:1207:13:1207:13 | y | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1207:17:1207:26 | GenS(...) |  | main.rs:1169:5:1169:28 | GenS |
+| main.rs:1207:17:1207:26 | GenS(...) | GenT | {EXTERNAL LOCATION} | bool |
+| main.rs:1207:17:1207:38 | ... .get_input() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1207:17:1207:38 | ... .get_input() | E | {EXTERNAL LOCATION} | bool |
+| main.rs:1207:17:1207:38 | ... .get_input() | T | {EXTERNAL LOCATION} | bool |
+| main.rs:1207:22:1207:25 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1220:16:1220:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1220:16:1220:24 | SelfParam | &T | main.rs:1218:5:1225:5 | Self [trait MyTrait] |
+| main.rs:1220:27:1220:31 | value |  | main.rs:1218:19:1218:19 | S |
+| main.rs:1222:21:1222:29 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1222:21:1222:29 | SelfParam | &T | main.rs:1218:5:1225:5 | Self [trait MyTrait] |
+| main.rs:1222:32:1222:36 | value |  | main.rs:1218:19:1218:19 | S |
+| main.rs:1223:13:1223:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1223:13:1223:16 | self | &T | main.rs:1218:5:1225:5 | Self [trait MyTrait] |
+| main.rs:1223:22:1223:26 | value |  | main.rs:1218:19:1218:19 | S |
+| main.rs:1229:16:1229:24 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1229:16:1229:24 | SelfParam | &T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1229:16:1229:24 | SelfParam | &T.T | main.rs:1227:10:1227:10 | T |
+| main.rs:1229:27:1229:31 | value |  | main.rs:1227:10:1227:10 | T |
+| main.rs:1233:26:1235:9 | { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1233:26:1235:9 | { ... } | T | main.rs:1232:10:1232:10 | T |
+| main.rs:1234:13:1234:30 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1234:13:1234:30 | ...::MyNone(...) | T | main.rs:1232:10:1232:10 | T |
+| main.rs:1239:20:1239:23 | SelfParam |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1239:20:1239:23 | SelfParam | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1239:20:1239:23 | SelfParam | T.T | main.rs:1238:10:1238:10 | T |
+| main.rs:1239:41:1244:9 | { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1239:41:1244:9 | { ... } | T | main.rs:1238:10:1238:10 | T |
+| main.rs:1240:13:1243:13 | match self { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1240:13:1243:13 | match self { ... } | T | main.rs:1238:10:1238:10 | T |
+| main.rs:1240:19:1240:22 | self |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1240:19:1240:22 | self | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1240:19:1240:22 | self | T.T | main.rs:1238:10:1238:10 | T |
+| main.rs:1241:17:1241:34 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1241:17:1241:34 | ...::MyNone(...) | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1241:17:1241:34 | ...::MyNone(...) | T.T | main.rs:1238:10:1238:10 | T |
+| main.rs:1241:39:1241:56 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1241:39:1241:56 | ...::MyNone(...) | T | main.rs:1238:10:1238:10 | T |
+| main.rs:1242:17:1242:35 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1242:17:1242:35 | ...::MySome(...) | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1242:17:1242:35 | ...::MySome(...) | T.T | main.rs:1238:10:1238:10 | T |
+| main.rs:1242:34:1242:34 | x |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1242:34:1242:34 | x | T | main.rs:1238:10:1238:10 | T |
+| main.rs:1242:40:1242:40 | x |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1242:40:1242:40 | x | T | main.rs:1238:10:1238:10 | T |
+| main.rs:1251:13:1251:14 | x1 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1251:13:1251:14 | x1 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1251:18:1251:37 | ...::new(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1251:18:1251:37 | ...::new(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1252:18:1252:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1252:18:1252:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1252:18:1252:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1252:18:1252:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1252:26:1252:27 | x1 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1252:26:1252:27 | x1 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1254:17:1254:18 | x2 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1254:17:1254:18 | x2 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1254:22:1254:36 | ...::new(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1254:22:1254:36 | ...::new(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1255:9:1255:10 | x2 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1255:9:1255:10 | x2 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1255:16:1255:16 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1256:18:1256:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1256:18:1256:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1256:18:1256:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1256:18:1256:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1256:26:1256:27 | x2 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1256:26:1256:27 | x2 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1259:17:1259:18 | x3 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1259:22:1259:36 | ...::new(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1260:9:1260:10 | x3 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1260:21:1260:21 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1261:18:1261:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1261:18:1261:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1261:18:1261:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1261:18:1261:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1261:26:1261:27 | x3 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1263:17:1263:18 | x4 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1263:17:1263:18 | x4 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1263:22:1263:36 | ...::new(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1263:22:1263:36 | ...::new(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1264:23:1264:29 | &mut x4 |  | file://:0:0:0:0 | & |
+| main.rs:1264:23:1264:29 | &mut x4 | &T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1264:23:1264:29 | &mut x4 | &T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1264:28:1264:29 | x4 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1264:28:1264:29 | x4 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1264:32:1264:32 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1265:18:1265:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1265:18:1265:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1265:18:1265:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1265:18:1265:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1265:26:1265:27 | x4 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1265:26:1265:27 | x4 | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1267:13:1267:14 | x5 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1267:13:1267:14 | x5 | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1267:13:1267:14 | x5 | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1267:18:1267:58 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1267:18:1267:58 | ...::MySome(...) | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1267:18:1267:58 | ...::MySome(...) | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1267:35:1267:57 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1267:35:1267:57 | ...::MyNone(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1268:18:1268:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1268:18:1268:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1268:18:1268:37 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1268:18:1268:37 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1268:26:1268:27 | x5 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1268:26:1268:27 | x5 | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1268:26:1268:27 | x5 | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1268:26:1268:37 | x5.flatten() |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1268:26:1268:37 | x5.flatten() | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1270:13:1270:14 | x6 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1270:13:1270:14 | x6 | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1270:13:1270:14 | x6 | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1270:18:1270:58 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1270:18:1270:58 | ...::MySome(...) | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1270:18:1270:58 | ...::MySome(...) | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1270:35:1270:57 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1270:35:1270:57 | ...::MyNone(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1271:18:1271:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1271:18:1271:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1271:18:1271:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1271:18:1271:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1271:26:1271:61 | ...::flatten(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1271:26:1271:61 | ...::flatten(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1271:59:1271:60 | x6 |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1271:59:1271:60 | x6 | T | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1271:59:1271:60 | x6 | T.T | main.rs:1247:5:1248:13 | S |
+| main.rs:1274:13:1274:19 | from_if |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1274:13:1274:19 | from_if | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1274:23:1278:9 | if ... {...} else {...} |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1274:23:1278:9 | if ... {...} else {...} | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1274:26:1274:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1274:26:1274:30 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1274:30:1274:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1274:32:1276:9 | { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1274:32:1276:9 | { ... } | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1275:13:1275:30 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1275:13:1275:30 | ...::MyNone(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1276:16:1278:9 | { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1276:16:1278:9 | { ... } | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1277:13:1277:31 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1277:13:1277:31 | ...::MySome(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1277:30:1277:30 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1279:18:1279:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1279:18:1279:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1279:18:1279:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1279:18:1279:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1279:26:1279:32 | from_if |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1279:26:1279:32 | from_if | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1282:13:1282:22 | from_match |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1282:13:1282:22 | from_match | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1282:26:1285:9 | match ... { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1282:26:1285:9 | match ... { ... } | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1282:32:1282:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1282:32:1282:36 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1282:36:1282:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1283:13:1283:16 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1283:21:1283:38 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1283:21:1283:38 | ...::MyNone(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1284:13:1284:17 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1284:22:1284:40 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1284:22:1284:40 | ...::MySome(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1284:39:1284:39 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1286:18:1286:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1286:18:1286:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1286:18:1286:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1286:18:1286:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1286:26:1286:35 | from_match |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1286:26:1286:35 | from_match | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1289:13:1289:21 | from_loop |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1289:13:1289:21 | from_loop | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1289:25:1294:9 | loop { ... } |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1289:25:1294:9 | loop { ... } | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1290:16:1290:16 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1290:16:1290:20 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1290:20:1290:20 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1291:23:1291:40 | ...::MyNone(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1291:23:1291:40 | ...::MyNone(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1293:19:1293:37 | ...::MySome(...) |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1293:19:1293:37 | ...::MySome(...) | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1293:36:1293:36 | S |  | main.rs:1247:5:1248:13 | S |
+| main.rs:1295:18:1295:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1295:18:1295:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1295:18:1295:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1295:18:1295:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1295:26:1295:34 | from_loop |  | main.rs:1212:5:1216:5 | MyOption |
+| main.rs:1295:26:1295:34 | from_loop | T | main.rs:1247:5:1248:13 | S |
+| main.rs:1313:15:1313:18 | SelfParam |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1313:15:1313:18 | SelfParam | T | main.rs:1312:10:1312:10 | T |
+| main.rs:1313:26:1315:9 | { ... } |  | main.rs:1312:10:1312:10 | T |
+| main.rs:1314:13:1314:16 | self |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1314:13:1314:16 | self | T | main.rs:1312:10:1312:10 | T |
+| main.rs:1314:13:1314:18 | self.0 |  | main.rs:1312:10:1312:10 | T |
+| main.rs:1317:15:1317:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1317:15:1317:19 | SelfParam | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1317:15:1317:19 | SelfParam | &T.T | main.rs:1312:10:1312:10 | T |
+| main.rs:1317:28:1319:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1317:28:1319:9 | { ... } | &T | main.rs:1312:10:1312:10 | T |
+| main.rs:1318:13:1318:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1318:13:1318:19 | &... | &T | main.rs:1312:10:1312:10 | T |
+| main.rs:1318:14:1318:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1318:14:1318:17 | self | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1318:14:1318:17 | self | &T.T | main.rs:1312:10:1312:10 | T |
+| main.rs:1318:14:1318:19 | self.0 |  | main.rs:1312:10:1312:10 | T |
+| main.rs:1321:15:1321:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1321:15:1321:25 | SelfParam | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1321:15:1321:25 | SelfParam | &T.T | main.rs:1312:10:1312:10 | T |
+| main.rs:1321:34:1323:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1321:34:1323:9 | { ... } | &T | main.rs:1312:10:1312:10 | T |
+| main.rs:1322:13:1322:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1322:13:1322:19 | &... | &T | main.rs:1312:10:1312:10 | T |
+| main.rs:1322:14:1322:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1322:14:1322:17 | self | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1322:14:1322:17 | self | &T.T | main.rs:1312:10:1312:10 | T |
+| main.rs:1322:14:1322:19 | self.0 |  | main.rs:1312:10:1312:10 | T |
+| main.rs:1327:29:1327:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1327:29:1327:33 | SelfParam | &T | main.rs:1326:5:1329:5 | Self [trait ATrait] |
+| main.rs:1328:33:1328:36 | SelfParam |  | main.rs:1326:5:1329:5 | Self [trait ATrait] |
+| main.rs:1334:29:1334:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1334:29:1334:33 | SelfParam | &T | file://:0:0:0:0 | & |
+| main.rs:1334:29:1334:33 | SelfParam | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1334:29:1334:33 | SelfParam | &T.&T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1334:43:1336:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1335:13:1335:22 | (...) |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:13:1335:24 | ... .a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1335:14:1335:21 | * ... |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:15:1335:21 | (...) |  | file://:0:0:0:0 | & |
+| main.rs:1335:15:1335:21 | (...) |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:15:1335:21 | (...) | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:16:1335:20 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1335:16:1335:20 | * ... |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:16:1335:20 | * ... | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:17:1335:20 | self |  | file://:0:0:0:0 | & |
+| main.rs:1335:17:1335:20 | self | &T | file://:0:0:0:0 | & |
+| main.rs:1335:17:1335:20 | self | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1335:17:1335:20 | self | &T.&T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1339:33:1339:36 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1339:33:1339:36 | SelfParam | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1339:46:1341:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1340:13:1340:19 | (...) |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1340:13:1340:21 | ... .a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1340:14:1340:18 | * ... |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1340:15:1340:18 | self |  | file://:0:0:0:0 | & |
+| main.rs:1340:15:1340:18 | self | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1345:13:1345:14 | x1 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1345:13:1345:14 | x1 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1345:18:1345:22 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1345:18:1345:22 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1345:20:1345:21 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1346:18:1346:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1346:18:1346:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1346:18:1346:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1346:18:1346:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1346:26:1346:27 | x1 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1346:26:1346:27 | x1 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1346:26:1346:32 | x1.m1() |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1348:13:1348:14 | x2 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1348:13:1348:14 | x2 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1348:18:1348:22 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1348:18:1348:22 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1348:20:1348:21 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1350:18:1350:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1350:18:1350:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1350:18:1350:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1350:18:1350:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1350:26:1350:27 | x2 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1350:26:1350:27 | x2 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1350:26:1350:32 | x2.m2() |  | file://:0:0:0:0 | & |
+| main.rs:1350:26:1350:32 | x2.m2() | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1351:18:1351:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1351:18:1351:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1351:18:1351:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1351:18:1351:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1351:26:1351:27 | x2 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1351:26:1351:27 | x2 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1351:26:1351:32 | x2.m3() |  | file://:0:0:0:0 | & |
+| main.rs:1351:26:1351:32 | x2.m3() | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1353:13:1353:14 | x3 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1353:13:1353:14 | x3 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1353:18:1353:22 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1353:18:1353:22 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1353:20:1353:21 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1355:18:1355:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1355:18:1355:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1355:18:1355:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1355:18:1355:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1355:26:1355:41 | ...::m2(...) |  | file://:0:0:0:0 | & |
+| main.rs:1355:26:1355:41 | ...::m2(...) | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1355:38:1355:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:1355:38:1355:40 | &x3 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1355:38:1355:40 | &x3 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1355:39:1355:40 | x3 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1355:39:1355:40 | x3 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1356:18:1356:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1356:18:1356:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1356:18:1356:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1356:18:1356:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1356:26:1356:41 | ...::m3(...) |  | file://:0:0:0:0 | & |
+| main.rs:1356:26:1356:41 | ...::m3(...) | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1356:38:1356:40 | &x3 |  | file://:0:0:0:0 | & |
+| main.rs:1356:38:1356:40 | &x3 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1356:38:1356:40 | &x3 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1356:39:1356:40 | x3 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1356:39:1356:40 | x3 | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1358:13:1358:14 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1358:13:1358:14 | x4 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1358:13:1358:14 | x4 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1358:18:1358:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1358:18:1358:23 | &... | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1358:18:1358:23 | &... | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1358:19:1358:23 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1358:19:1358:23 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1358:21:1358:22 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1360:18:1360:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1360:18:1360:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1360:18:1360:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1360:18:1360:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1360:26:1360:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1360:26:1360:27 | x4 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1360:26:1360:27 | x4 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1360:26:1360:32 | x4.m2() |  | file://:0:0:0:0 | & |
+| main.rs:1360:26:1360:32 | x4.m2() | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1361:18:1361:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1361:18:1361:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1361:18:1361:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1361:18:1361:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1361:26:1361:27 | x4 |  | file://:0:0:0:0 | & |
+| main.rs:1361:26:1361:27 | x4 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1361:26:1361:27 | x4 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1361:26:1361:32 | x4.m3() |  | file://:0:0:0:0 | & |
+| main.rs:1361:26:1361:32 | x4.m3() | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1363:13:1363:14 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1363:13:1363:14 | x5 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1363:13:1363:14 | x5 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1363:18:1363:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1363:18:1363:23 | &... | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1363:18:1363:23 | &... | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1363:19:1363:23 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1363:19:1363:23 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1363:21:1363:22 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1365:18:1365:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1365:18:1365:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1365:18:1365:32 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1365:18:1365:32 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1365:26:1365:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1365:26:1365:27 | x5 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1365:26:1365:27 | x5 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1365:26:1365:32 | x5.m1() |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1366:18:1366:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1366:18:1366:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1366:18:1366:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1366:18:1366:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1366:26:1366:27 | x5 |  | file://:0:0:0:0 | & |
+| main.rs:1366:26:1366:27 | x5 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1366:26:1366:27 | x5 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1366:26:1366:29 | x5.0 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1368:13:1368:14 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1368:13:1368:14 | x6 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1368:13:1368:14 | x6 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1368:18:1368:23 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1368:18:1368:23 | &... | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1368:18:1368:23 | &... | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1368:19:1368:23 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1368:19:1368:23 | S(...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1368:21:1368:22 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1371:18:1371:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1371:18:1371:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1371:18:1371:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1371:18:1371:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1371:26:1371:30 | (...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1371:26:1371:30 | (...) | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1371:26:1371:35 | ... .m1() |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1371:27:1371:29 | * ... |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1371:27:1371:29 | * ... | T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1371:28:1371:29 | x6 |  | file://:0:0:0:0 | & |
+| main.rs:1371:28:1371:29 | x6 | &T | main.rs:1301:5:1302:19 | S |
+| main.rs:1371:28:1371:29 | x6 | &T.T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1373:13:1373:14 | x7 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1373:13:1373:14 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1373:13:1373:14 | x7 | T.&T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1373:18:1373:23 | S(...) |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1373:18:1373:23 | S(...) | T | file://:0:0:0:0 | & |
+| main.rs:1373:18:1373:23 | S(...) | T.&T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1373:20:1373:22 | &S2 |  | file://:0:0:0:0 | & |
+| main.rs:1373:20:1373:22 | &S2 | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1373:21:1373:22 | S2 |  | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1376:13:1376:13 | t |  | file://:0:0:0:0 | & |
+| main.rs:1376:13:1376:13 | t | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1376:17:1376:18 | x7 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1376:17:1376:18 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1376:17:1376:18 | x7 | T.&T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1376:17:1376:23 | x7.m1() |  | file://:0:0:0:0 | & |
+| main.rs:1376:17:1376:23 | x7.m1() | &T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1377:18:1377:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1377:18:1377:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1377:18:1377:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1377:18:1377:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1377:26:1377:27 | x7 |  | main.rs:1301:5:1302:19 | S |
+| main.rs:1377:26:1377:27 | x7 | T | file://:0:0:0:0 | & |
+| main.rs:1377:26:1377:27 | x7 | T.&T | main.rs:1304:5:1305:14 | S2 |
+| main.rs:1379:13:1379:14 | x9 |  | {EXTERNAL LOCATION} | String |
+| main.rs:1379:26:1379:32 | "Hello" |  | file://:0:0:0:0 | & |
+| main.rs:1379:26:1379:32 | "Hello" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1379:26:1379:44 | "Hello".to_string() |  | {EXTERNAL LOCATION} | String |
+| main.rs:1383:13:1383:13 | u |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1383:13:1383:13 | u | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1383:17:1383:18 | x9 |  | {EXTERNAL LOCATION} | String |
+| main.rs:1383:17:1383:33 | x9.parse() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1383:17:1383:33 | x9.parse() | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:1385:13:1385:20 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1385:13:1385:20 | my_thing | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1385:24:1385:39 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1385:24:1385:39 | &... | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1385:25:1385:39 | MyInt {...} |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1385:36:1385:37 | 37 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1385:36:1385:37 | 37 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1387:17:1387:24 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1387:17:1387:24 | my_thing | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1388:18:1388:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1388:18:1388:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1388:18:1388:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1388:18:1388:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1391:13:1391:20 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1391:13:1391:20 | my_thing | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1391:24:1391:39 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1391:24:1391:39 | &... | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1391:25:1391:39 | MyInt {...} |  | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1391:36:1391:37 | 38 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1391:36:1391:37 | 38 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1392:17:1392:24 | my_thing |  | file://:0:0:0:0 | & |
+| main.rs:1392:17:1392:24 | my_thing | &T | main.rs:1307:5:1310:5 | MyInt |
+| main.rs:1393:18:1393:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1393:18:1393:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1393:18:1393:26 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1393:18:1393:26 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1400:16:1400:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1400:16:1400:20 | SelfParam | &T | main.rs:1398:5:1406:5 | Self [trait MyTrait] |
+| main.rs:1403:16:1403:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1403:16:1403:20 | SelfParam | &T | main.rs:1398:5:1406:5 | Self [trait MyTrait] |
+| main.rs:1403:32:1405:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1403:32:1405:9 | { ... } | &T | main.rs:1398:5:1406:5 | Self [trait MyTrait] |
+| main.rs:1404:13:1404:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1404:13:1404:16 | self | &T | main.rs:1398:5:1406:5 | Self [trait MyTrait] |
+| main.rs:1404:13:1404:22 | self.foo() |  | file://:0:0:0:0 | & |
+| main.rs:1404:13:1404:22 | self.foo() | &T | main.rs:1398:5:1406:5 | Self [trait MyTrait] |
+| main.rs:1412:16:1412:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1412:16:1412:20 | SelfParam | &T | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1412:36:1414:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1412:36:1414:9 | { ... } | &T | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1413:13:1413:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1413:13:1413:16 | self | &T | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1418:13:1418:13 | x |  | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1418:17:1418:24 | MyStruct |  | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1419:9:1419:9 | x |  | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1419:9:1419:15 | x.bar() |  | file://:0:0:0:0 | & |
+| main.rs:1419:9:1419:15 | x.bar() | &T | main.rs:1408:5:1408:20 | MyStruct |
+| main.rs:1429:16:1429:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1429:16:1429:20 | SelfParam | &T | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1429:16:1429:20 | SelfParam | &T.T | main.rs:1428:10:1428:10 | T |
+| main.rs:1429:32:1431:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1429:32:1431:9 | { ... } | &T | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1429:32:1431:9 | { ... } | &T.T | main.rs:1428:10:1428:10 | T |
+| main.rs:1430:13:1430:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1430:13:1430:16 | self | &T | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1430:13:1430:16 | self | &T.T | main.rs:1428:10:1428:10 | T |
+| main.rs:1435:13:1435:13 | x |  | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1435:13:1435:13 | x | T | main.rs:1424:5:1424:13 | S |
+| main.rs:1435:17:1435:27 | MyStruct(...) |  | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1435:17:1435:27 | MyStruct(...) | T | main.rs:1424:5:1424:13 | S |
+| main.rs:1435:26:1435:26 | S |  | main.rs:1424:5:1424:13 | S |
+| main.rs:1436:9:1436:9 | x |  | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1436:9:1436:9 | x | T | main.rs:1424:5:1424:13 | S |
+| main.rs:1436:9:1436:15 | x.foo() |  | file://:0:0:0:0 | & |
+| main.rs:1436:9:1436:15 | x.foo() | &T | main.rs:1426:5:1426:26 | MyStruct |
+| main.rs:1436:9:1436:15 | x.foo() | &T.T | main.rs:1424:5:1424:13 | S |
+| main.rs:1447:17:1447:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1447:17:1447:25 | SelfParam | &T | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1448:13:1448:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1448:13:1448:16 | self | &T | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1448:13:1448:21 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1448:13:1448:34 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1448:25:1448:34 | ! ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1448:26:1448:29 | self |  | file://:0:0:0:0 | & |
+| main.rs:1448:26:1448:29 | self | &T | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1448:26:1448:34 | self.bool |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1455:15:1455:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1455:15:1455:19 | SelfParam | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1455:31:1457:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1455:31:1457:9 | { ... } | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1456:13:1456:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1456:13:1456:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1456:13:1456:19 | &... | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1456:13:1456:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1456:13:1456:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1456:13:1456:19 | &... | &T.&T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1456:14:1456:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1456:14:1456:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1456:14:1456:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1456:14:1456:19 | &... | &T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1456:15:1456:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1456:15:1456:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1456:15:1456:19 | &self | &T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1456:16:1456:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1456:16:1456:19 | self | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1459:15:1459:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1459:15:1459:25 | SelfParam | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1459:37:1461:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1459:37:1461:9 | { ... } | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1460:13:1460:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1460:13:1460:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1460:13:1460:19 | &... | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1460:13:1460:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1460:13:1460:19 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1460:13:1460:19 | &... | &T.&T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1460:14:1460:19 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1460:14:1460:19 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1460:14:1460:19 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1460:14:1460:19 | &... | &T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1460:15:1460:19 | &self |  | file://:0:0:0:0 | & |
+| main.rs:1460:15:1460:19 | &self | &T | file://:0:0:0:0 | & |
+| main.rs:1460:15:1460:19 | &self | &T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1460:16:1460:19 | self |  | file://:0:0:0:0 | & |
+| main.rs:1460:16:1460:19 | self | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1463:15:1463:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1463:15:1463:15 | x | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1463:34:1465:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1463:34:1465:9 | { ... } | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1464:13:1464:13 | x |  | file://:0:0:0:0 | & |
+| main.rs:1464:13:1464:13 | x | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1467:15:1467:15 | x |  | file://:0:0:0:0 | & |
+| main.rs:1467:15:1467:15 | x | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1467:34:1469:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:1467:34:1469:9 | { ... } | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1468:13:1468:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1468:13:1468:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1468:13:1468:16 | &... | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1468:13:1468:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1468:13:1468:16 | &... | &T.&T.&T | file://:0:0:0:0 | & |
+| main.rs:1468:13:1468:16 | &... | &T.&T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1468:14:1468:16 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1468:14:1468:16 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1468:14:1468:16 | &... | &T.&T | file://:0:0:0:0 | & |
+| main.rs:1468:14:1468:16 | &... | &T.&T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1468:15:1468:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1468:15:1468:16 | &x | &T | file://:0:0:0:0 | & |
+| main.rs:1468:15:1468:16 | &x | &T.&T | main.rs:1452:5:1452:13 | S |
+| main.rs:1468:16:1468:16 | x |  | file://:0:0:0:0 | & |
+| main.rs:1468:16:1468:16 | x | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1473:13:1473:13 | x |  | main.rs:1452:5:1452:13 | S |
+| main.rs:1473:17:1473:20 | S {...} |  | main.rs:1452:5:1452:13 | S |
+| main.rs:1474:9:1474:9 | x |  | main.rs:1452:5:1452:13 | S |
+| main.rs:1474:9:1474:14 | x.f1() |  | file://:0:0:0:0 | & |
+| main.rs:1474:9:1474:14 | x.f1() | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1475:9:1475:9 | x |  | main.rs:1452:5:1452:13 | S |
+| main.rs:1475:9:1475:14 | x.f2() |  | file://:0:0:0:0 | & |
+| main.rs:1475:9:1475:14 | x.f2() | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1476:9:1476:17 | ...::f3(...) |  | file://:0:0:0:0 | & |
+| main.rs:1476:9:1476:17 | ...::f3(...) | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1476:15:1476:16 | &x |  | file://:0:0:0:0 | & |
+| main.rs:1476:15:1476:16 | &x | &T | main.rs:1452:5:1452:13 | S |
+| main.rs:1476:16:1476:16 | x |  | main.rs:1452:5:1452:13 | S |
+| main.rs:1478:13:1478:13 | n |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:17:1478:24 | * ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:18:1478:24 | * ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:18:1478:24 | * ... |  | file://:0:0:0:0 | & |
+| main.rs:1478:18:1478:24 | * ... | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:19:1478:24 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1478:19:1478:24 | &... | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:19:1478:24 | &... | &T | file://:0:0:0:0 | & |
+| main.rs:1478:19:1478:24 | &... | &T.&T | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:20:1478:24 | &true |  | file://:0:0:0:0 | & |
+| main.rs:1478:20:1478:24 | &true | &T | {EXTERNAL LOCATION} | bool |
+| main.rs:1478:21:1478:24 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1482:17:1482:20 | flag |  | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1482:24:1482:41 | ...::default(...) |  | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1483:22:1483:30 | &mut flag |  | file://:0:0:0:0 | & |
+| main.rs:1483:22:1483:30 | &mut flag | &T | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1483:27:1483:30 | flag |  | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1484:18:1484:23 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1484:18:1484:23 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1484:18:1484:29 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1484:18:1484:29 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1484:26:1484:29 | flag |  | main.rs:1441:5:1444:5 | MyFlag |
+| main.rs:1499:43:1502:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1499:43:1502:5 | { ... } | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1499:43:1502:5 | { ... } | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1500:13:1500:13 | x |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1500:17:1500:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1500:17:1500:30 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1500:17:1500:31 | TryExpr |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1500:28:1500:29 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1501:9:1501:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1501:9:1501:22 | ...::Ok(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1501:9:1501:22 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1501:20:1501:21 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1506:46:1510:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1506:46:1510:5 | { ... } | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1506:46:1510:5 | { ... } | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1507:13:1507:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1507:13:1507:13 | x | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1507:17:1507:30 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1507:17:1507:30 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1507:28:1507:29 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1508:13:1508:13 | y |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1508:17:1508:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1508:17:1508:17 | x | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1508:17:1508:18 | TryExpr |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1509:9:1509:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1509:9:1509:22 | ...::Ok(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1509:9:1509:22 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1509:20:1509:21 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1514:40:1519:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1514:40:1519:5 | { ... } | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1514:40:1519:5 | { ... } | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1515:13:1515:13 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1515:13:1515:13 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1515:13:1515:13 | x | T.T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1515:17:1515:42 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1515:17:1515:42 | ...::Ok(...) | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1515:17:1515:42 | ...::Ok(...) | T.T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1515:28:1515:41 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1515:28:1515:41 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1515:39:1515:40 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1517:17:1517:17 | x |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1517:17:1517:17 | x | T | {EXTERNAL LOCATION} | Result |
+| main.rs:1517:17:1517:17 | x | T.T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1517:17:1517:18 | TryExpr |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1517:17:1517:18 | TryExpr | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1517:17:1517:29 | ... .map(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1517:24:1517:28 | \|...\| s |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:1517:24:1517:28 | \|...\| s | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:1518:9:1518:22 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1518:9:1518:22 | ...::Ok(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1518:9:1518:22 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1518:20:1518:21 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1523:30:1523:34 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1523:30:1523:34 | input | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1523:30:1523:34 | input | T | main.rs:1523:20:1523:27 | T |
+| main.rs:1523:69:1530:5 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1523:69:1530:5 | { ... } | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1523:69:1530:5 | { ... } | T | main.rs:1523:20:1523:27 | T |
+| main.rs:1524:13:1524:17 | value |  | main.rs:1523:20:1523:27 | T |
+| main.rs:1524:21:1524:25 | input |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1524:21:1524:25 | input | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1524:21:1524:25 | input | T | main.rs:1523:20:1523:27 | T |
+| main.rs:1524:21:1524:26 | TryExpr |  | main.rs:1523:20:1523:27 | T |
+| main.rs:1525:22:1525:38 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1525:22:1525:38 | ...::Ok(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1525:22:1525:38 | ...::Ok(...) | T | main.rs:1523:20:1523:27 | T |
+| main.rs:1525:22:1528:10 | ... .and_then(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1525:22:1528:10 | ... .and_then(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1525:33:1525:37 | value |  | main.rs:1523:20:1523:27 | T |
+| main.rs:1525:49:1528:9 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:1525:49:1528:9 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:1525:49:1528:9 | \|...\| ... | dyn(Output) | {EXTERNAL LOCATION} | Result |
+| main.rs:1525:49:1528:9 | \|...\| ... | dyn(Output).E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1525:53:1528:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1525:53:1528:9 | { ... } | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1526:22:1526:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1526:22:1526:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1526:22:1526:30 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1526:22:1526:30 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1527:13:1527:34 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1527:13:1527:34 | ...::Ok::<...>(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1529:9:1529:23 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1529:9:1529:23 | ...::Err(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1529:9:1529:23 | ...::Err(...) | T | main.rs:1523:20:1523:27 | T |
+| main.rs:1529:21:1529:22 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1534:16:1534:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1534:16:1534:33 | ...::Ok(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1534:16:1534:33 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1534:27:1534:32 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1534:37:1534:52 | try_same_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1534:37:1534:52 | try_same_error(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1534:37:1534:52 | try_same_error(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1535:22:1535:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1535:22:1535:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1535:22:1535:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1535:22:1535:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1535:30:1535:35 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1538:16:1538:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1538:16:1538:33 | ...::Ok(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1538:16:1538:33 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1538:27:1538:32 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1538:37:1538:55 | try_convert_error(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1538:37:1538:55 | try_convert_error(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1538:37:1538:55 | try_convert_error(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1539:22:1539:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1539:22:1539:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1539:22:1539:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1539:22:1539:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1539:30:1539:35 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1542:16:1542:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1542:16:1542:33 | ...::Ok(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1542:16:1542:33 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1542:27:1542:32 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1542:37:1542:49 | try_chained(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1542:37:1542:49 | try_chained(...) | E | main.rs:1494:5:1495:14 | S2 |
+| main.rs:1542:37:1542:49 | try_chained(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1543:22:1543:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1543:22:1543:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1543:22:1543:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1543:22:1543:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1543:30:1543:35 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:16:1546:33 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1546:16:1546:33 | ...::Ok(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:16:1546:33 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:27:1546:32 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:37:1546:63 | try_complex(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1546:37:1546:63 | try_complex(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:37:1546:63 | try_complex(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:49:1546:62 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:1546:49:1546:62 | ...::Ok(...) | E | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:49:1546:62 | ...::Ok(...) | T | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1546:60:1546:61 | S1 |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1547:22:1547:27 | "{:?}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:1547:22:1547:27 | "{:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1547:22:1547:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1547:22:1547:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:1547:30:1547:35 | result |  | main.rs:1491:5:1492:14 | S1 |
+| main.rs:1554:13:1554:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1554:22:1554:22 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1555:13:1555:13 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1555:17:1555:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1556:13:1556:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1556:17:1556:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1556:17:1556:21 | ... + ... |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1556:21:1556:21 | y |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1557:13:1557:13 | z |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1557:17:1557:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1557:17:1557:23 | x.abs() |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1558:13:1558:13 | c |  | {EXTERNAL LOCATION} | char |
+| main.rs:1558:17:1558:19 | 'c' |  | {EXTERNAL LOCATION} | char |
+| main.rs:1559:13:1559:17 | hello |  | file://:0:0:0:0 | & |
+| main.rs:1559:13:1559:17 | hello | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1559:21:1559:27 | "Hello" |  | file://:0:0:0:0 | & |
+| main.rs:1559:21:1559:27 | "Hello" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:1560:13:1560:13 | f |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1560:17:1560:24 | 123.0f64 |  | {EXTERNAL LOCATION} | f64 |
+| main.rs:1561:13:1561:13 | t |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1561:17:1561:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1562:13:1562:13 | f |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1562:17:1562:21 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1569:13:1569:13 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1569:17:1569:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1569:17:1569:29 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1569:25:1569:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1570:13:1570:13 | y |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1570:17:1570:20 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1570:17:1570:29 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1570:25:1570:29 | false |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1572:17:1572:17 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1573:13:1573:16 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1573:20:1573:21 | 34 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1573:20:1573:27 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1573:26:1573:27 | 33 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1574:12:1574:15 | cond |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1575:17:1575:17 | z |  | file://:0:0:0:0 | () |
+| main.rs:1575:21:1575:27 | (...) |  | file://:0:0:0:0 | () |
+| main.rs:1575:22:1575:22 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1575:22:1575:26 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1575:26:1575:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1577:13:1577:13 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1577:13:1577:17 | ... = ... |  | file://:0:0:0:0 | () |
+| main.rs:1577:17:1577:17 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1579:9:1579:9 | a |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1593:30:1595:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1594:13:1594:31 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1594:23:1594:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1594:23:1594:23 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1594:29:1594:29 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1594:29:1594:29 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1601:16:1601:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1601:22:1601:24 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1601:41:1606:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1602:13:1605:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1603:20:1603:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1603:20:1603:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1603:20:1603:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1603:29:1603:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1603:29:1603:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1604:20:1604:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1604:20:1604:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1604:20:1604:33 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1604:29:1604:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1604:29:1604:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1611:23:1611:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1611:23:1611:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1611:34:1611:36 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1612:13:1612:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1612:13:1612:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1612:13:1612:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1612:13:1612:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1612:23:1612:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1612:23:1612:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1613:13:1613:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1613:13:1613:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1613:13:1613:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1613:13:1613:27 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1613:23:1613:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1613:23:1613:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1619:16:1619:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1619:22:1619:24 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1619:41:1624:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1620:13:1623:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1621:20:1621:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1621:20:1621:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1621:20:1621:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1621:29:1621:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1621:29:1621:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1622:20:1622:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1622:20:1622:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1622:20:1622:33 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1622:29:1622:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1622:29:1622:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1629:23:1629:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1629:23:1629:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1629:34:1629:36 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1630:13:1630:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1630:13:1630:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1630:13:1630:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1630:13:1630:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1630:23:1630:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1630:23:1630:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1631:13:1631:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1631:13:1631:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1631:13:1631:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1631:13:1631:27 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1631:23:1631:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1631:23:1631:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1637:16:1637:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1637:22:1637:24 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1637:41:1642:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1638:13:1641:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1639:20:1639:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1639:20:1639:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1639:20:1639:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1639:29:1639:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1639:29:1639:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1640:20:1640:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1640:20:1640:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1640:20:1640:33 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1640:29:1640:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1640:29:1640:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1646:23:1646:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1646:23:1646:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1646:34:1646:36 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1647:13:1647:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1647:13:1647:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1647:13:1647:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1647:13:1647:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1647:23:1647:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1647:23:1647:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1648:13:1648:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1648:13:1648:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1648:13:1648:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1648:13:1648:27 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1648:23:1648:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1648:23:1648:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1654:16:1654:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1654:22:1654:24 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1654:41:1659:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1655:13:1658:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1656:20:1656:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1656:20:1656:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1656:20:1656:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1656:29:1656:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1656:29:1656:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1657:20:1657:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1657:20:1657:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1657:20:1657:33 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1657:29:1657:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1657:29:1657:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1663:23:1663:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1663:23:1663:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1663:34:1663:36 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1664:13:1664:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1664:13:1664:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1664:13:1664:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1664:13:1664:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1664:23:1664:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1664:23:1664:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1665:13:1665:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1665:13:1665:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1665:13:1665:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1665:13:1665:27 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1665:23:1665:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1665:23:1665:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1671:16:1671:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1671:22:1671:24 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1671:41:1676:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1672:13:1675:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1673:20:1673:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1673:20:1673:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1673:20:1673:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1673:29:1673:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1673:29:1673:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1674:20:1674:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1674:20:1674:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1674:20:1674:33 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1674:29:1674:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1674:29:1674:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1680:23:1680:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1680:23:1680:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1680:34:1680:36 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1681:13:1681:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1681:13:1681:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1681:13:1681:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1681:13:1681:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1681:23:1681:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1681:23:1681:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1682:13:1682:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1682:13:1682:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1682:13:1682:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1682:13:1682:27 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1682:23:1682:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1682:23:1682:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1688:19:1688:22 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1688:25:1688:27 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1688:44:1693:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1689:13:1692:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1690:20:1690:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1690:20:1690:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1690:20:1690:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1690:29:1690:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1690:29:1690:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1691:20:1691:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1691:20:1691:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1691:20:1691:33 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1691:29:1691:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1691:29:1691:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1697:26:1697:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1697:26:1697:34 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1697:37:1697:39 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1698:13:1698:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1698:13:1698:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1698:13:1698:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1698:13:1698:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1698:23:1698:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1698:23:1698:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1699:13:1699:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1699:13:1699:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1699:13:1699:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1699:13:1699:27 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1699:23:1699:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1699:23:1699:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1705:18:1705:21 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1705:24:1705:26 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1705:43:1710:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1706:13:1709:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1707:20:1707:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1707:20:1707:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1707:20:1707:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1707:29:1707:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1707:29:1707:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1708:20:1708:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1708:20:1708:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1708:20:1708:33 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1708:29:1708:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1708:29:1708:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1714:25:1714:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1714:25:1714:33 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1714:36:1714:38 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1715:13:1715:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1715:13:1715:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1715:13:1715:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1715:13:1715:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1715:23:1715:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1715:23:1715:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1716:13:1716:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1716:13:1716:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1716:13:1716:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1716:13:1716:27 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1716:23:1716:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1716:23:1716:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1722:19:1722:22 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1722:25:1722:27 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1722:44:1727:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1723:13:1726:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1724:20:1724:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1724:20:1724:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1724:20:1724:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1724:29:1724:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1724:29:1724:33 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1725:20:1725:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1725:20:1725:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1725:20:1725:33 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1725:29:1725:31 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1725:29:1725:33 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1731:26:1731:34 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1731:26:1731:34 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1731:37:1731:39 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1732:13:1732:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1732:13:1732:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1732:13:1732:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1732:13:1732:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1732:23:1732:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1732:23:1732:27 | rhs.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1733:13:1733:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1733:13:1733:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1733:13:1733:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1733:13:1733:27 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1733:23:1733:25 | rhs |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1733:23:1733:27 | rhs.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1739:16:1739:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1739:22:1739:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1739:40:1744:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1740:13:1743:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1741:20:1741:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1741:20:1741:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1741:20:1741:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1741:30:1741:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1742:20:1742:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1742:20:1742:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1742:20:1742:32 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1742:30:1742:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1748:23:1748:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1748:23:1748:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1748:34:1748:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1749:13:1749:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1749:13:1749:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1749:13:1749:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1749:13:1749:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1749:24:1749:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1750:13:1750:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1750:13:1750:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1750:13:1750:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1750:13:1750:26 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1750:24:1750:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1756:16:1756:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1756:22:1756:24 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1756:40:1761:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1757:13:1760:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1758:20:1758:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1758:20:1758:25 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1758:20:1758:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1758:30:1758:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1759:20:1759:23 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1759:20:1759:25 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1759:20:1759:32 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1759:30:1759:32 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1765:23:1765:31 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1765:23:1765:31 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1765:34:1765:36 | rhs |  | {EXTERNAL LOCATION} | u32 |
 | main.rs:1766:13:1766:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1766:13:1766:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
+| main.rs:1766:13:1766:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
 | main.rs:1766:13:1766:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:13:1766:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:13:1766:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:22:1766:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1766:22:1766:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:22:1766:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:33:1766:36 | self |  | file://:0:0:0:0 | & |
-| main.rs:1766:33:1766:36 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:33:1766:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1766:33:1766:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1766:42:1766:46 | other |  | file://:0:0:0:0 | & |
-| main.rs:1766:42:1766:46 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1766:42:1766:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1769:15:1769:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1769:15:1769:19 | SelfParam | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1769:22:1769:26 | other |  | file://:0:0:0:0 | & |
-| main.rs:1769:22:1769:26 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1769:44:1771:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:13:1770:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:1770:13:1770:16 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:13:1770:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:13:1770:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:13:1770:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:23:1770:27 | other |  | file://:0:0:0:0 | & |
-| main.rs:1770:23:1770:27 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:23:1770:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:34:1770:37 | self |  | file://:0:0:0:0 | & |
-| main.rs:1770:34:1770:37 | self | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:34:1770:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1770:34:1770:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1770:44:1770:48 | other |  | file://:0:0:0:0 | & |
-| main.rs:1770:44:1770:48 | other | &T | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1770:44:1770:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1777:13:1777:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:22:1777:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:23:1777:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1777:23:1777:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1777:31:1777:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1778:13:1778:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:22:1778:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:23:1778:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1778:23:1778:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1778:31:1778:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1779:13:1779:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:22:1779:34 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:23:1779:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1779:23:1779:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1779:30:1779:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1780:13:1780:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:22:1780:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:23:1780:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1780:23:1780:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1780:31:1780:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1781:13:1781:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:22:1781:35 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:23:1781:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1781:23:1781:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1781:30:1781:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1782:13:1782:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:22:1782:37 | (...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:23:1782:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1782:23:1782:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1782:32:1782:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:13:1785:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:23:1785:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:23:1785:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1785:31:1785:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:13:1786:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:23:1786:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:23:1786:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1786:31:1786:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:13:1787:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:23:1787:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:23:1787:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1787:31:1787:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:13:1788:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:23:1788:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:23:1788:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1788:31:1788:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:13:1789:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:23:1789:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:23:1789:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1789:31:1789:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1792:17:1792:30 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1792:34:1792:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1793:9:1793:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1793:9:1793:31 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1793:27:1793:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1795:17:1795:30 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1795:34:1795:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1796:9:1796:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1796:9:1796:31 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1796:27:1796:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1798:17:1798:30 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1798:34:1798:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1799:9:1799:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1799:9:1799:31 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1799:27:1799:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1801:17:1801:30 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1801:34:1801:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1802:9:1802:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1802:9:1802:31 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1802:27:1802:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1804:17:1804:30 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1804:34:1804:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1805:9:1805:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1805:9:1805:31 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1805:27:1805:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:13:1808:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:26:1808:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:26:1808:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1808:34:1808:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:13:1809:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:25:1809:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:25:1809:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1809:33:1809:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:13:1810:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:26:1810:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:26:1810:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1810:34:1810:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:13:1811:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:23:1811:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:23:1811:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1811:32:1811:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:13:1812:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:23:1812:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:23:1812:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1812:32:1812:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1815:17:1815:33 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1815:37:1815:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1816:9:1816:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1816:9:1816:34 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1816:30:1816:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1818:17:1818:32 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1818:36:1818:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1819:9:1819:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1819:9:1819:33 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1819:29:1819:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1821:17:1821:33 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1821:37:1821:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1822:9:1822:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1822:9:1822:34 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1822:30:1822:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1824:17:1824:30 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1824:34:1824:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1825:9:1825:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1825:9:1825:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1825:28:1825:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1827:17:1827:30 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1827:34:1827:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1828:9:1828:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1828:9:1828:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1828:28:1828:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:13:1830:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:23:1830:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1830:24:1830:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:13:1831:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:23:1831:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1831:24:1831:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1834:13:1834:14 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1834:18:1834:36 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1834:28:1834:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1834:28:1834:28 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1834:34:1834:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1834:34:1834:34 | 2 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1835:13:1835:14 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1835:18:1835:36 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1835:28:1835:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1835:28:1835:28 | 3 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1835:34:1835:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1835:34:1835:34 | 4 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1838:13:1838:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1838:23:1838:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1838:23:1838:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1838:29:1838:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1839:13:1839:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1839:23:1839:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1839:23:1839:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1839:29:1839:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1840:13:1840:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1840:23:1840:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1840:23:1840:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1840:28:1840:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1841:13:1841:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1841:23:1841:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1841:23:1841:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1841:29:1841:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1842:13:1842:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1842:23:1842:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1842:23:1842:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1842:28:1842:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1843:13:1843:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1843:23:1843:24 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1843:23:1843:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1843:29:1843:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:13:1846:20 | vec2_add |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:24:1846:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:24:1846:30 | ... + ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1846:29:1846:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:13:1847:20 | vec2_sub |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:24:1847:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:24:1847:30 | ... - ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1847:29:1847:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:13:1848:20 | vec2_mul |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:24:1848:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:24:1848:30 | ... * ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1848:29:1848:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:13:1849:20 | vec2_div |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:24:1849:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:24:1849:30 | ... / ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1849:29:1849:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:13:1850:20 | vec2_rem |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:24:1850:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:24:1850:30 | ... % ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1850:29:1850:30 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1853:17:1853:31 | vec2_add_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1853:35:1853:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1854:9:1854:23 | vec2_add_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1854:9:1854:29 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:1854:28:1854:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1856:17:1856:31 | vec2_sub_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1856:35:1856:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1857:9:1857:23 | vec2_sub_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1857:9:1857:29 | ... -= ... |  | file://:0:0:0:0 | () |
-| main.rs:1857:28:1857:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1859:17:1859:31 | vec2_mul_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1859:35:1859:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1860:9:1860:23 | vec2_mul_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1860:9:1860:29 | ... *= ... |  | file://:0:0:0:0 | () |
-| main.rs:1860:28:1860:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1862:17:1862:31 | vec2_div_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1862:35:1862:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1863:9:1863:23 | vec2_div_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1863:9:1863:29 | ... /= ... |  | file://:0:0:0:0 | () |
-| main.rs:1863:28:1863:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1865:17:1865:31 | vec2_rem_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1865:35:1865:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1866:9:1866:23 | vec2_rem_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1866:9:1866:29 | ... %= ... |  | file://:0:0:0:0 | () |
-| main.rs:1866:28:1866:29 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:13:1869:23 | vec2_bitand |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:27:1869:28 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:27:1869:33 | ... & ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1869:32:1869:33 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:13:1870:22 | vec2_bitor |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:26:1870:27 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:26:1870:32 | ... \| ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1870:31:1870:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:13:1871:23 | vec2_bitxor |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:27:1871:28 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:27:1871:33 | ... ^ ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1871:32:1871:33 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:13:1872:20 | vec2_shl |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:24:1872:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:24:1872:33 | ... << ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1872:30:1872:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1873:13:1873:20 | vec2_shr |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:24:1873:25 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:24:1873:33 | ... >> ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1873:30:1873:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1876:17:1876:34 | vec2_bitand_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1876:38:1876:39 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1877:9:1877:26 | vec2_bitand_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1877:9:1877:32 | ... &= ... |  | file://:0:0:0:0 | () |
-| main.rs:1877:31:1877:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1879:17:1879:33 | vec2_bitor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1879:37:1879:38 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1880:9:1880:25 | vec2_bitor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1880:9:1880:31 | ... \|= ... |  | file://:0:0:0:0 | () |
-| main.rs:1880:30:1880:31 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1882:17:1882:34 | vec2_bitxor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1882:38:1882:39 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1883:9:1883:26 | vec2_bitxor_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1883:9:1883:32 | ... ^= ... |  | file://:0:0:0:0 | () |
-| main.rs:1883:31:1883:32 | v2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1885:17:1885:31 | vec2_shl_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1885:35:1885:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1886:9:1886:23 | vec2_shl_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1886:9:1886:32 | ... <<= ... |  | file://:0:0:0:0 | () |
-| main.rs:1886:29:1886:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1888:17:1888:31 | vec2_shr_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1888:35:1888:36 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1889:9:1889:23 | vec2_shr_assign |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1889:9:1889:32 | ... >>= ... |  | file://:0:0:0:0 | () |
-| main.rs:1889:29:1889:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:1892:13:1892:20 | vec2_neg |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1892:24:1892:26 | - ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1892:25:1892:26 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:13:1893:20 | vec2_not |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:24:1893:26 | ! ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1893:25:1893:26 | v1 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1896:13:1896:24 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1896:28:1896:45 | ...::default(...) |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:13:1897:26 | vec2_zero_plus |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:30:1897:48 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:30:1897:63 | ... + ... |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1897:40:1897:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1897:40:1897:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1897:46:1897:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1897:46:1897:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1897:52:1897:63 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1901:13:1901:24 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1901:28:1901:45 | ...::default(...) |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1902:13:1902:26 | vec2_zero_plus |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1902:30:1902:48 | Vec2 {...} |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1902:30:1902:64 | ... == ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:1902:40:1902:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1902:40:1902:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1902:46:1902:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:1902:46:1902:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:1902:53:1902:64 | default_vec2 |  | main.rs:1537:5:1542:5 | Vec2 |
-| main.rs:1912:18:1912:21 | SelfParam |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1915:25:1917:5 | { ... } |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1916:9:1916:10 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1919:41:1921:5 | { ... } |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1920:9:1920:20 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1920:9:1920:20 | { ... } |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1920:9:1920:20 | { ... } | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1920:17:1920:18 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1929:13:1929:42 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
-| main.rs:1929:13:1929:42 | SelfParam | Ptr | file://:0:0:0:0 | & |
-| main.rs:1929:13:1929:42 | SelfParam | Ptr.&T | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1930:13:1930:15 | _cx |  | file://:0:0:0:0 | & |
-| main.rs:1930:13:1930:15 | _cx | &T | {EXTERNAL LOCATION} | Context |
-| main.rs:1931:44:1933:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
-| main.rs:1931:44:1933:9 | { ... } | T | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1932:13:1932:38 | ...::Ready(...) |  | {EXTERNAL LOCATION} | Poll |
-| main.rs:1932:13:1932:38 | ...::Ready(...) | T | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1932:36:1932:37 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1936:41:1938:5 | { ... } |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1937:9:1937:10 | S2 |  | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1937:9:1937:10 | S2 |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1941:9:1941:12 | f1(...) |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1941:9:1941:12 | f1(...) | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1941:9:1941:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1942:9:1942:12 | f2(...) |  | main.rs:1919:16:1919:39 | ImplTraitTypeRepr |
-| main.rs:1942:9:1942:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1943:9:1943:12 | f3(...) |  | main.rs:1936:16:1936:39 | ImplTraitTypeRepr |
-| main.rs:1943:9:1943:18 | await ... |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1944:9:1944:10 | S2 |  | main.rs:1923:5:1923:14 | S2 |
-| main.rs:1944:9:1944:16 | await S2 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:13:1945:13 | b |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1945:13:1945:13 | b | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:17:1945:28 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1945:17:1945:28 | { ... } | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1945:25:1945:26 | S1 |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1946:9:1946:9 | b |  | {EXTERNAL LOCATION} | trait Future |
-| main.rs:1946:9:1946:9 | b | Output | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1946:9:1946:15 | await b |  | main.rs:1909:5:1909:14 | S1 |
-| main.rs:1957:15:1957:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1957:15:1957:19 | SelfParam | &T | main.rs:1956:5:1958:5 | Self [trait Trait1] |
-| main.rs:1961:15:1961:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1961:15:1961:19 | SelfParam | &T | main.rs:1960:5:1962:5 | Self [trait Trait2] |
-| main.rs:1965:15:1965:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1965:15:1965:19 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1969:15:1969:19 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1969:15:1969:19 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1972:37:1974:5 | { ... } |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:1973:9:1973:10 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1973:9:1973:10 | S1 |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:1977:18:1977:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1977:18:1977:22 | SelfParam | &T | main.rs:1976:5:1978:5 | Self [trait MyTrait] |
-| main.rs:1981:18:1981:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1981:18:1981:22 | SelfParam | &T | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1981:31:1983:9 | { ... } |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:1982:13:1982:14 | S2 |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:1987:18:1987:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:1987:18:1987:22 | SelfParam |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1987:18:1987:22 | SelfParam | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1987:18:1987:22 | SelfParam | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1987:30:1990:9 | { ... } |  | main.rs:1986:10:1986:17 | T |
-| main.rs:1988:17:1988:21 | S3(...) |  | file://:0:0:0:0 | & |
-| main.rs:1988:17:1988:21 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:17:1988:21 | S3(...) | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:17:1988:21 | S3(...) | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1988:25:1988:28 | self |  | file://:0:0:0:0 | & |
-| main.rs:1988:25:1988:28 | self |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:25:1988:28 | self | &T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:1988:25:1988:28 | self | &T.T3 | main.rs:1986:10:1986:17 | T |
-| main.rs:1989:13:1989:21 | t.clone() |  | main.rs:1986:10:1986:17 | T |
-| main.rs:1993:45:1995:5 | { ... } |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:1994:9:1994:10 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:1994:9:1994:10 | S1 |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:1997:41:1997:41 | t |  | main.rs:1997:26:1997:38 | B |
-| main.rs:1997:52:1999:5 | { ... } |  | main.rs:1997:23:1997:23 | A |
-| main.rs:1998:9:1998:9 | t |  | main.rs:1997:26:1997:38 | B |
-| main.rs:1998:9:1998:17 | t.get_a() |  | main.rs:1997:23:1997:23 | A |
-| main.rs:2001:34:2001:34 | x |  | main.rs:2001:24:2001:31 | T |
-| main.rs:2001:59:2003:5 | { ... } |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2001:59:2003:5 | { ... } | impl(T) | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:9:2002:13 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2002:9:2002:13 | S3(...) |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2002:9:2002:13 | S3(...) | T3 | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:9:2002:13 | S3(...) | impl(T) | main.rs:2001:24:2001:31 | T |
-| main.rs:2002:12:2002:12 | x |  | main.rs:2001:24:2001:31 | T |
-| main.rs:2005:34:2005:34 | x |  | main.rs:2005:24:2005:31 | T |
-| main.rs:2005:67:2007:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2005:67:2007:5 | { ... } | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2005:67:2007:5 | { ... } | T.impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:9:2006:19 | Some(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2006:9:2006:19 | Some(...) | T | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2006:9:2006:19 | Some(...) | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2006:9:2006:19 | Some(...) | T.T3 | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:9:2006:19 | Some(...) | T.impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:14:2006:18 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2006:14:2006:18 | S3(...) |  | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2006:14:2006:18 | S3(...) | T3 | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:14:2006:18 | S3(...) | impl(T) | main.rs:2005:24:2005:31 | T |
-| main.rs:2006:17:2006:17 | x |  | main.rs:2005:24:2005:31 | T |
-| main.rs:2009:34:2009:34 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2009:78:2011:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2009:78:2011:5 | { ... } | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2009:78:2011:5 | { ... } | 0(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2009:78:2011:5 | { ... } | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2009:78:2011:5 | { ... } | 1(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2) | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2).T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 0(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2) | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2).T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:9:2010:30 | TupleExpr | 1(2).impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:10:2010:22 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:10:2010:22 | S3(...) |  | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2010:10:2010:22 | S3(...) | T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:10:2010:22 | S3(...) | impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:13:2010:13 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:13:2010:21 | x.clone() |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:25:2010:29 | S3(...) |  | main.rs:1954:5:1954:22 | S3 |
-| main.rs:2010:25:2010:29 | S3(...) |  | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2010:25:2010:29 | S3(...) | T3 | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:25:2010:29 | S3(...) | impl(T) | main.rs:2009:24:2009:31 | T |
-| main.rs:2010:28:2010:28 | x |  | main.rs:2009:24:2009:31 | T |
-| main.rs:2013:26:2013:26 | t |  | main.rs:2013:29:2013:43 | ImplTraitTypeRepr |
-| main.rs:2013:51:2015:5 | { ... } |  | main.rs:2013:23:2013:23 | A |
-| main.rs:2014:9:2014:9 | t |  | main.rs:2013:29:2013:43 | ImplTraitTypeRepr |
-| main.rs:2014:9:2014:17 | t.get_a() |  | main.rs:2013:23:2013:23 | A |
-| main.rs:2018:13:2018:13 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2018:17:2018:20 | f1(...) |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2019:9:2019:9 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2020:9:2020:9 | x |  | main.rs:1972:16:1972:35 | ImplTraitTypeRepr |
-| main.rs:2021:13:2021:13 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2021:17:2021:32 | get_a_my_trait(...) |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2022:13:2022:13 | b |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2022:17:2022:33 | uses_my_trait1(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2022:32:2022:32 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2023:13:2023:13 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2023:17:2023:32 | get_a_my_trait(...) |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2024:13:2024:13 | c |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2024:17:2024:33 | uses_my_trait2(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2024:32:2024:32 | a |  | main.rs:1993:28:1993:43 | ImplTraitTypeRepr |
-| main.rs:2025:13:2025:13 | d |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2025:17:2025:34 | uses_my_trait2(...) |  | main.rs:1953:5:1953:14 | S2 |
-| main.rs:2025:32:2025:33 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:13:2026:13 | e |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:17:2026:35 | get_a_my_trait2(...) |  | main.rs:2001:43:2001:57 | ImplTraitTypeRepr |
-| main.rs:2026:17:2026:35 | get_a_my_trait2(...) | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:17:2026:43 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2026:33:2026:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:13:2029:13 | f |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) | T | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2029:17:2029:35 | get_a_my_trait3(...) | T.impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:44 | ... .unwrap() |  | main.rs:2005:50:2005:64 | ImplTraitTypeRepr |
-| main.rs:2029:17:2029:44 | ... .unwrap() | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:17:2029:52 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2029:33:2029:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:13:2030:13 | g |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 0(2) | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 0(2).impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 1(2) | main.rs:2009:61:2009:75 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:35 | get_a_my_trait4(...) | 1(2).impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:37 | ... .0 |  | main.rs:2009:44:2009:58 | ImplTraitTypeRepr |
-| main.rs:2030:17:2030:37 | ... .0 | impl(T) | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:17:2030:45 | ... .get_a() |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2030:33:2030:34 | S1 |  | main.rs:1951:5:1952:14 | S1 |
-| main.rs:2041:16:2041:20 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2041:16:2041:20 | SelfParam | &T | main.rs:2037:5:2038:13 | S |
-| main.rs:2041:31:2043:9 | { ... } |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2042:13:2042:13 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2052:26:2054:9 | { ... } |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2052:26:2054:9 | { ... } | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2053:13:2053:38 | MyVec {...} |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2053:13:2053:38 | MyVec {...} | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2053:27:2053:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2053:27:2053:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2053:27:2053:36 | ...::new(...) | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2056:17:2056:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2056:17:2056:25 | SelfParam | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2056:17:2056:25 | SelfParam | &T.T | main.rs:2051:10:2051:10 | T |
-| main.rs:2056:28:2056:32 | value |  | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:13:2057:16 | self |  | file://:0:0:0:0 | & |
-| main.rs:2057:13:2057:16 | self | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2057:13:2057:16 | self | &T.T | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:13:2057:21 | self.data |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2057:13:2057:21 | self.data | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2057:13:2057:21 | self.data | T | main.rs:2051:10:2051:10 | T |
-| main.rs:2057:28:2057:32 | value |  | main.rs:2051:10:2051:10 | T |
-| main.rs:2065:18:2065:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2065:18:2065:22 | SelfParam | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2065:18:2065:22 | SelfParam | &T.T | main.rs:2061:10:2061:10 | T |
-| main.rs:2065:25:2065:29 | index |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2065:56:2067:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:2065:56:2067:9 | { ... } | &T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:13:2066:29 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2066:13:2066:29 | &... | &T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:17 | self |  | file://:0:0:0:0 | & |
-| main.rs:2066:14:2066:17 | self | &T | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2066:14:2066:17 | self | &T.T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2066:14:2066:22 | self.data | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2066:14:2066:22 | self.data | T | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:14:2066:29 | ...[index] |  | main.rs:2061:10:2061:10 | T |
-| main.rs:2066:24:2066:28 | index |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2070:22:2070:26 | slice |  | file://:0:0:0:0 | & |
-| main.rs:2070:22:2070:26 | slice | &T | file://:0:0:0:0 | [] |
-| main.rs:2070:22:2070:26 | slice | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:13:2071:13 | x |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:21 | slice |  | file://:0:0:0:0 | & |
-| main.rs:2071:17:2071:21 | slice | &T | file://:0:0:0:0 | [] |
-| main.rs:2071:17:2071:21 | slice | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:24 | slice[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:17:2071:30 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2071:23:2071:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2075:17:2075:19 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2075:17:2075:19 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2075:23:2075:34 | ...::new(...) |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2075:23:2075:34 | ...::new(...) | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2076:9:2076:11 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2076:9:2076:11 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2076:18:2076:18 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:11 | vec |  | main.rs:2046:5:2049:5 | MyVec |
-| main.rs:2077:9:2077:11 | vec | T | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:14 | vec[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:9:2077:20 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2077:13:2077:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2077:13:2077:13 | 0 |  | {EXTERNAL LOCATION} | usize |
-| main.rs:2079:13:2079:14 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2079:13:2079:14 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2079:21:2079:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2079:26:2079:28 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2079:26:2079:28 | [...] | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2079:27:2079:27 | S |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:13:2080:13 | x |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:18 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2080:17:2080:18 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:21 | xs[0] |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:17:2080:27 | ... .foo() |  | main.rs:2037:5:2038:13 | S |
-| main.rs:2080:20:2080:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2082:23:2082:25 | &xs |  | file://:0:0:0:0 | & |
-| main.rs:2082:23:2082:25 | &xs | &T | file://:0:0:0:0 | [] |
-| main.rs:2082:23:2082:25 | &xs | &T | file://:0:0:0:0 | [] |
-| main.rs:2082:23:2082:25 | &xs | &T.[T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2082:23:2082:25 | &xs | &T.[T] | main.rs:2037:5:2038:13 | S |
-| main.rs:2082:24:2082:25 | xs |  | file://:0:0:0:0 | [] |
-| main.rs:2082:24:2082:25 | xs | [T;...] | main.rs:2037:5:2038:13 | S |
-| main.rs:2088:13:2088:13 | x |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:17:2088:46 | MacroExpr |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:35 | "Hello, {}" |  | file://:0:0:0:0 | & |
-| main.rs:2088:25:2088:35 | "Hello, {}" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2088:25:2088:45 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:45 | ...::must_use(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:25:2088:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2088:25:2088:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2088:25:2088:45 | { ... } |  | {EXTERNAL LOCATION} | String |
-| main.rs:2088:38:2088:45 | "World!" |  | file://:0:0:0:0 | & |
-| main.rs:2088:38:2088:45 | "World!" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2097:19:2097:22 | SelfParam |  | main.rs:2093:5:2098:5 | Self [trait MyAdd] |
-| main.rs:2097:25:2097:27 | rhs |  | main.rs:2093:17:2093:26 | Rhs |
-| main.rs:2104:19:2104:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2104:25:2104:29 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2104:45:2106:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2105:13:2105:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:19:2113:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:25:2113:29 | value |  | file://:0:0:0:0 | & |
-| main.rs:2113:25:2113:29 | value | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2113:46:2115:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2114:13:2114:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2114:14:2114:18 | value |  | file://:0:0:0:0 | & |
-| main.rs:2114:14:2114:18 | value | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2122:19:2122:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2122:25:2122:29 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2122:46:2128:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2123:13:2127:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2123:13:2127:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2123:16:2123:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2123:22:2125:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2123:22:2125:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2124:17:2124:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2124:17:2124:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2125:20:2127:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2125:20:2127:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2126:17:2126:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2126:17:2126:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2137:19:2137:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:19:2137:22 | SelfParam | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2137:25:2137:29 | other |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:25:2137:29 | other | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2137:54:2139:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2137:54:2139:9 | { ... } | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:13:2138:39 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:13:2138:39 | S(...) | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:15:2138:22 | (...) |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:15:2138:38 | ... .my_add(...) |  | main.rs:2094:9:2094:20 | Output |
-| main.rs:2138:16:2138:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:16:2138:19 | self | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:16:2138:21 | self.0 |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:31:2138:35 | other |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2138:31:2138:35 | other | T | main.rs:2133:10:2133:17 | T |
-| main.rs:2138:31:2138:37 | other.0 |  | main.rs:2093:5:2098:5 | Self [trait MyAdd] |
-| main.rs:2138:31:2138:37 | other.0 |  | main.rs:2133:10:2133:17 | T |
-| main.rs:2146:19:2146:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2146:19:2146:22 | SelfParam | T | main.rs:2142:10:2142:17 | T |
-| main.rs:2146:25:2146:29 | other |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2146:51:2148:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2146:51:2148:9 | { ... } | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:13:2147:37 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2147:13:2147:37 | S(...) | T | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:15:2147:22 | (...) |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:15:2147:36 | ... .my_add(...) |  | main.rs:2094:9:2094:20 | Output |
-| main.rs:2147:16:2147:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2147:16:2147:19 | self | T | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:16:2147:21 | self.0 |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2147:31:2147:35 | other |  | main.rs:2142:10:2142:17 | T |
-| main.rs:2158:19:2158:22 | SelfParam |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2158:19:2158:22 | SelfParam | T | main.rs:2151:14:2151:14 | T |
-| main.rs:2158:25:2158:29 | other |  | file://:0:0:0:0 | & |
-| main.rs:2158:25:2158:29 | other | &T | main.rs:2151:14:2151:14 | T |
-| main.rs:2158:55:2160:9 | { ... } |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:13:2159:37 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:15:2159:22 | (...) |  | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:16:2159:19 | self |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2159:16:2159:19 | self | T | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:16:2159:21 | self.0 |  | main.rs:2151:14:2151:14 | T |
-| main.rs:2159:31:2159:35 | other |  | file://:0:0:0:0 | & |
-| main.rs:2159:31:2159:35 | other | &T | main.rs:2151:14:2151:14 | T |
-| main.rs:2165:20:2165:24 | value |  | main.rs:2163:18:2163:18 | T |
-| main.rs:2170:20:2170:24 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2170:40:2172:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2171:13:2171:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2177:20:2177:24 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2177:41:2183:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2178:13:2182:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2178:13:2182:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2178:16:2178:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2178:22:2180:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2178:22:2180:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2179:17:2179:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2179:17:2179:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2180:20:2182:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2180:20:2182:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2181:17:2181:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2181:17:2181:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2188:21:2188:25 | value |  | main.rs:2186:19:2186:19 | T |
-| main.rs:2188:31:2188:31 | x |  | main.rs:2186:5:2189:5 | Self [trait MyFrom2] |
-| main.rs:2193:21:2193:25 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2193:33:2193:33 | _ |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2193:48:2195:9 | { ... } |  | file://:0:0:0:0 | () |
-| main.rs:2194:13:2194:17 | value |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2200:21:2200:25 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2200:34:2200:34 | _ |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2200:49:2206:9 | { ... } |  | file://:0:0:0:0 | () |
-| main.rs:2201:13:2205:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2201:16:2201:20 | value |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2201:22:2203:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2202:17:2202:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2203:20:2205:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2204:17:2204:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2211:15:2211:15 | x |  | main.rs:2209:5:2215:5 | Self [trait MySelfTrait] |
-| main.rs:2214:15:2214:15 | x |  | main.rs:2209:5:2215:5 | Self [trait MySelfTrait] |
-| main.rs:2219:15:2219:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2219:31:2221:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:13:2220:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:13:2220:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2220:17:2220:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2224:15:2224:15 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2224:32:2226:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:13:2225:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:13:2225:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2225:17:2225:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2231:15:2231:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2231:31:2233:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2232:13:2232:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2232:13:2232:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2236:15:2236:15 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2236:32:2238:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2237:13:2237:13 | x |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2242:13:2242:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2242:22:2242:23 | 73 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2242:22:2242:23 | 73 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:9:2243:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:9:2243:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2243:18:2243:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:9:2244:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:9:2244:23 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:18:2244:22 | &5i64 |  | file://:0:0:0:0 | & |
-| main.rs:2244:18:2244:22 | &5i64 | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2244:19:2244:22 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:9:2245:9 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:9:2245:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2245:18:2245:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2247:9:2247:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:9:2247:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:9:2247:31 | ... .my_add(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:11:2247:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:24:2247:30 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2247:24:2247:30 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2247:26:2247:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:9:2248:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2248:9:2248:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:11:2248:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2248:24:2248:27 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:9:2249:15 | S(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2249:9:2249:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:9:2249:29 | ... .my_add(...) |  | main.rs:2131:5:2131:19 | S |
-| main.rs:2249:11:2249:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:24:2249:28 | &3i64 |  | file://:0:0:0:0 | & |
-| main.rs:2249:24:2249:28 | &3i64 | &T | {EXTERNAL LOCATION} | i64 |
-| main.rs:2249:25:2249:28 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:13:2251:13 | x |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:17:2251:35 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2251:30:2251:34 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:13:2252:13 | y |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:17:2252:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2252:30:2252:33 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2253:13:2253:13 | z |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2253:22:2253:43 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2253:38:2253:42 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2254:9:2254:34 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2254:23:2254:27 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2254:30:2254:33 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2255:9:2255:33 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2255:23:2255:26 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2255:29:2255:32 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2256:9:2256:38 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
-| main.rs:2256:27:2256:31 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2256:34:2256:37 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2258:9:2258:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2258:17:2258:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2259:9:2259:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2259:17:2259:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2260:9:2260:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2260:18:2260:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2261:9:2261:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2261:18:2261:21 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2262:9:2262:30 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2262:25:2262:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2263:9:2263:30 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2263:25:2263:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2264:9:2264:29 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2264:25:2264:28 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2265:9:2265:29 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2265:25:2265:28 | true |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2273:26:2275:9 | { ... } |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2274:13:2274:25 | MyCallable {...} |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2277:17:2277:21 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2277:17:2277:21 | SelfParam | &T | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2277:31:2279:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2278:13:2278:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2278:13:2278:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2285:13:2285:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:18:2285:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2285:18:2285:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:19:2285:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:22:2285:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2285:25:2285:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:18:2286:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2286:18:2286:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:18:2286:41 | ... .map(...) |  | file://:0:0:0:0 | [] |
-| main.rs:2286:19:2286:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:22:2286:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:25:2286:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2286:32:2286:40 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
-| main.rs:2286:32:2286:40 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
-| main.rs:2286:40:2286:40 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:13:2287:13 | i |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2287:13:2287:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:18:2287:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2287:18:2287:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:18:2287:38 | ... .into_iter() |  | {EXTERNAL LOCATION} | IntoIter |
-| main.rs:2287:18:2287:38 | ... .into_iter() | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:19:2287:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:22:2287:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2287:25:2287:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:13:2289:17 | vals1 |  | file://:0:0:0:0 | [] |
-| main.rs:2289:13:2289:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:13:2289:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:21:2289:31 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2289:21:2289:31 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:21:2289:31 | [...] | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:22:2289:24 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:27:2289:27 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:27:2289:27 | 2 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2289:30:2289:30 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2289:30:2289:30 | 3 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2290:13:2290:13 | u |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2290:13:2290:13 | u |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2290:18:2290:22 | vals1 |  | file://:0:0:0:0 | [] |
-| main.rs:2290:18:2290:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2290:18:2290:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
-| main.rs:2292:13:2292:17 | vals2 |  | file://:0:0:0:0 | [] |
-| main.rs:2292:13:2292:17 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:21:2292:29 | [1u16; 3] |  | file://:0:0:0:0 | [] |
-| main.rs:2292:21:2292:29 | [1u16; 3] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:22:2292:25 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2292:28:2292:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2293:13:2293:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2293:18:2293:22 | vals2 |  | file://:0:0:0:0 | [] |
-| main.rs:2293:18:2293:22 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2295:13:2295:17 | vals3 |  | file://:0:0:0:0 | [] |
-| main.rs:2295:13:2295:17 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:26:2295:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:31:2295:39 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2295:31:2295:39 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:31:2295:39 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:32:2295:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:32:2295:32 | 1 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:35:2295:35 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:35:2295:35 | 2 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2295:38:2295:38 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2295:38:2295:38 | 3 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2296:13:2296:13 | u |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2296:18:2296:22 | vals3 |  | file://:0:0:0:0 | [] |
-| main.rs:2296:18:2296:22 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2298:13:2298:17 | vals4 |  | file://:0:0:0:0 | [] |
-| main.rs:2298:13:2298:17 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:26:2298:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:31:2298:36 | [1; 3] |  | file://:0:0:0:0 | [] |
-| main.rs:2298:31:2298:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:31:2298:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:32:2298:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2298:32:2298:32 | 1 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2298:35:2298:35 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2299:13:2299:13 | u |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2299:18:2299:22 | vals4 |  | file://:0:0:0:0 | [] |
-| main.rs:2299:18:2299:22 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2301:17:2301:24 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2301:17:2301:24 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2301:17:2301:24 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:28:2301:48 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2301:28:2301:48 | [...] | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2301:28:2301:48 | [...] | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:29:2301:33 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2301:29:2301:33 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:36:2301:40 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2301:36:2301:40 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2301:43:2301:47 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2301:43:2301:47 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:13:2302:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2302:13:2302:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2302:13:2302:13 | s | &T | file://:0:0:0:0 | & |
-| main.rs:2302:13:2302:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:18:2302:26 | &strings1 |  | file://:0:0:0:0 | & |
-| main.rs:2302:18:2302:26 | &strings1 | &T | file://:0:0:0:0 | [] |
-| main.rs:2302:18:2302:26 | &strings1 | &T.[T;...] | file://:0:0:0:0 | & |
-| main.rs:2302:18:2302:26 | &strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2302:19:2302:26 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2302:19:2302:26 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2302:19:2302:26 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:13:2303:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2303:13:2303:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2303:13:2303:13 | s | &T | file://:0:0:0:0 | & |
-| main.rs:2303:13:2303:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:18:2303:30 | &mut strings1 |  | file://:0:0:0:0 | & |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T | file://:0:0:0:0 | [] |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T.[T;...] | file://:0:0:0:0 | & |
-| main.rs:2303:18:2303:30 | &mut strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2303:23:2303:30 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2303:23:2303:30 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2303:23:2303:30 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2304:13:2304:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2304:13:2304:13 | s | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2304:18:2304:25 | strings1 |  | file://:0:0:0:0 | [] |
-| main.rs:2304:18:2304:25 | strings1 | [T;...] | file://:0:0:0:0 | & |
-| main.rs:2304:18:2304:25 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
-| main.rs:2306:13:2306:20 | strings2 |  | file://:0:0:0:0 | [] |
-| main.rs:2306:13:2306:20 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2307:9:2311:9 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2307:9:2311:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2308:13:2308:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2308:26:2308:30 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2308:26:2308:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2309:13:2309:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2309:26:2309:30 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2309:26:2309:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2310:13:2310:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2310:26:2310:30 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2310:26:2310:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2312:13:2312:13 | s |  | {EXTERNAL LOCATION} | String |
-| main.rs:2312:18:2312:25 | strings2 |  | file://:0:0:0:0 | [] |
-| main.rs:2312:18:2312:25 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2314:13:2314:20 | strings3 |  | file://:0:0:0:0 | & |
-| main.rs:2314:13:2314:20 | strings3 | &T | file://:0:0:0:0 | [] |
-| main.rs:2314:13:2314:20 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2315:9:2319:9 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2315:9:2319:9 | &... | &T | file://:0:0:0:0 | [] |
-| main.rs:2315:9:2319:9 | &... | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2315:10:2319:9 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2315:10:2319:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2316:13:2316:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2316:26:2316:30 | "foo" |  | file://:0:0:0:0 | & |
-| main.rs:2316:26:2316:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2317:13:2317:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2317:26:2317:30 | "bar" |  | file://:0:0:0:0 | & |
-| main.rs:2317:26:2317:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2318:13:2318:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
-| main.rs:2318:26:2318:30 | "baz" |  | file://:0:0:0:0 | & |
-| main.rs:2318:26:2318:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2320:13:2320:13 | s |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2320:13:2320:13 | s |  | file://:0:0:0:0 | & |
-| main.rs:2320:13:2320:13 | s | &T | {EXTERNAL LOCATION} | String |
-| main.rs:2320:18:2320:25 | strings3 |  | file://:0:0:0:0 | & |
-| main.rs:2320:18:2320:25 | strings3 | &T | file://:0:0:0:0 | [] |
-| main.rs:2320:18:2320:25 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
-| main.rs:2322:13:2322:21 | callables |  | file://:0:0:0:0 | [] |
-| main.rs:2322:13:2322:21 | callables | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:25:2322:81 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2322:25:2322:81 | [...] | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:26:2322:42 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:45:2322:61 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2322:64:2322:80 | ...::new(...) |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2323:13:2323:13 | c |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2324:12:2324:20 | callables |  | file://:0:0:0:0 | [] |
-| main.rs:2324:12:2324:20 | callables | [T;...] | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2326:17:2326:22 | result |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2326:26:2326:26 | c |  | main.rs:2270:5:2270:24 | MyCallable |
-| main.rs:2326:26:2326:33 | c.call() |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2331:13:2331:13 | i |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2331:13:2331:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:18:2331:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:18:2331:22 | 0..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2331:18:2331:22 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2331:21:2331:22 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:13:2332:13 | u |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:13:2332:13 | u | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:13:2332:13 | u | Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:18:2332:26 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2332:18:2332:26 | [...] | [T;...] | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:18:2332:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:18:2332:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:19:2332:21 | 0u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:19:2332:25 | 0u8..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2332:19:2332:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:19:2332:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | u8 |
-| main.rs:2332:24:2332:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2332:24:2332:25 | 10 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2333:13:2333:17 | range |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2333:13:2333:17 | range | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:21:2333:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:21:2333:25 | 0..10 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2333:21:2333:25 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2333:24:2333:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2334:13:2334:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:1766:13:1766:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1766:24:1766:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1767:13:1767:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1767:13:1767:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1767:13:1767:18 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1767:13:1767:26 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1767:24:1767:26 | rhs |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1773:16:1773:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1773:30:1778:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1774:13:1777:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1775:20:1775:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1775:21:1775:24 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1775:21:1775:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1776:20:1776:26 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1776:21:1776:24 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1776:21:1776:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1783:16:1783:19 | SelfParam |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1783:30:1788:9 | { ... } |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1784:13:1787:13 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1785:20:1785:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1785:21:1785:24 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1785:21:1785:26 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1786:20:1786:26 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1786:21:1786:24 | self |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1786:21:1786:26 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1792:15:1792:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1792:15:1792:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1792:22:1792:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1792:22:1792:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1792:44:1794:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1793:13:1793:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1793:13:1793:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1793:13:1793:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1793:13:1793:29 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1793:13:1793:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1793:23:1793:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1793:23:1793:27 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1793:23:1793:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1793:34:1793:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1793:34:1793:37 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1793:34:1793:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1793:34:1793:50 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1793:44:1793:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1793:44:1793:48 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1793:44:1793:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1796:15:1796:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1796:15:1796:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1796:22:1796:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1796:22:1796:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1796:44:1798:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1797:13:1797:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1797:13:1797:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1797:13:1797:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1797:13:1797:29 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1797:13:1797:50 | ... \|\| ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1797:23:1797:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1797:23:1797:27 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1797:23:1797:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1797:34:1797:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1797:34:1797:37 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1797:34:1797:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1797:34:1797:50 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1797:44:1797:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1797:44:1797:48 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1797:44:1797:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1802:24:1802:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1802:24:1802:28 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1802:31:1802:35 | other |  | file://:0:0:0:0 | & |
+| main.rs:1802:31:1802:35 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1802:75:1804:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1802:75:1804:9 | { ... } | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1803:13:1803:29 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:13:1803:63 | ... .partial_cmp(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:1803:13:1803:63 | ... .partial_cmp(...) | T | {EXTERNAL LOCATION} | Ordering |
+| main.rs:1803:14:1803:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:1803:14:1803:17 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1803:14:1803:19 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:14:1803:28 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:23:1803:26 | self |  | file://:0:0:0:0 | & |
+| main.rs:1803:23:1803:26 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1803:23:1803:28 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:43:1803:62 | &... |  | file://:0:0:0:0 | & |
+| main.rs:1803:43:1803:62 | &... | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:44:1803:62 | (...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:45:1803:49 | other |  | file://:0:0:0:0 | & |
+| main.rs:1803:45:1803:49 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1803:45:1803:51 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:45:1803:61 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1803:55:1803:59 | other |  | file://:0:0:0:0 | & |
+| main.rs:1803:55:1803:59 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1803:55:1803:61 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1806:15:1806:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1806:15:1806:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1806:22:1806:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1806:22:1806:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1806:44:1808:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1807:13:1807:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1807:13:1807:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1807:13:1807:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:13:1807:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1807:13:1807:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1807:22:1807:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1807:22:1807:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1807:22:1807:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:33:1807:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1807:33:1807:36 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1807:33:1807:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1807:33:1807:48 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1807:42:1807:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1807:42:1807:46 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1807:42:1807:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1810:15:1810:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1810:15:1810:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1810:22:1810:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1810:22:1810:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1810:44:1812:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1811:13:1811:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1811:13:1811:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1811:13:1811:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1811:13:1811:29 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1811:13:1811:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1811:23:1811:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1811:23:1811:27 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1811:23:1811:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1811:34:1811:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1811:34:1811:37 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1811:34:1811:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1811:34:1811:50 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1811:44:1811:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1811:44:1811:48 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1811:44:1811:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1814:15:1814:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1814:15:1814:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1814:22:1814:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1814:22:1814:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1814:44:1816:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1815:13:1815:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1815:13:1815:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1815:13:1815:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1815:13:1815:28 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1815:13:1815:48 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1815:22:1815:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1815:22:1815:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1815:22:1815:28 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1815:33:1815:36 | self |  | file://:0:0:0:0 | & |
+| main.rs:1815:33:1815:36 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1815:33:1815:38 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1815:33:1815:48 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1815:42:1815:46 | other |  | file://:0:0:0:0 | & |
+| main.rs:1815:42:1815:46 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1815:42:1815:48 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1818:15:1818:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:1818:15:1818:19 | SelfParam | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1818:22:1818:26 | other |  | file://:0:0:0:0 | & |
+| main.rs:1818:22:1818:26 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1818:44:1820:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1819:13:1819:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:1819:13:1819:16 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1819:13:1819:18 | self.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1819:13:1819:29 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1819:13:1819:50 | ... && ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1819:23:1819:27 | other |  | file://:0:0:0:0 | & |
+| main.rs:1819:23:1819:27 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1819:23:1819:29 | other.x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1819:34:1819:37 | self |  | file://:0:0:0:0 | & |
+| main.rs:1819:34:1819:37 | self | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1819:34:1819:39 | self.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1819:34:1819:50 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1819:44:1819:48 | other |  | file://:0:0:0:0 | & |
+| main.rs:1819:44:1819:48 | other | &T | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1819:44:1819:50 | other.y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1826:13:1826:18 | i64_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1826:22:1826:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1826:23:1826:26 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1826:23:1826:34 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1826:31:1826:34 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1827:13:1827:18 | i64_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1827:22:1827:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1827:23:1827:26 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1827:23:1827:34 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1827:31:1827:34 | 4i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1828:13:1828:18 | i64_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1828:22:1828:34 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1828:23:1828:26 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1828:23:1828:33 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1828:30:1828:33 | 6i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1829:13:1829:18 | i64_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1829:22:1829:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1829:23:1829:26 | 7i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1829:23:1829:34 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1829:31:1829:34 | 8i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1830:13:1830:18 | i64_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1830:22:1830:35 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1830:23:1830:26 | 9i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1830:23:1830:34 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1830:30:1830:34 | 10i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1831:13:1831:18 | i64_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1831:22:1831:37 | (...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1831:23:1831:27 | 11i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1831:23:1831:36 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1831:32:1831:36 | 12i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1834:13:1834:19 | i64_add |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1834:23:1834:27 | 13i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1834:23:1834:35 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1834:31:1834:35 | 14i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1835:13:1835:19 | i64_sub |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1835:23:1835:27 | 15i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1835:23:1835:35 | ... - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1835:31:1835:35 | 16i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1836:13:1836:19 | i64_mul |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1836:23:1836:27 | 17i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1836:23:1836:35 | ... * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1836:31:1836:35 | 18i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1837:13:1837:19 | i64_div |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1837:23:1837:27 | 19i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1837:23:1837:35 | ... / ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1837:31:1837:35 | 20i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1838:13:1838:19 | i64_rem |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1838:23:1838:27 | 21i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1838:23:1838:35 | ... % ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1838:31:1838:35 | 22i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1841:17:1841:30 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1841:34:1841:38 | 23i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1842:9:1842:22 | i64_add_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1842:9:1842:31 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1842:27:1842:31 | 24i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1844:17:1844:30 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1844:34:1844:38 | 25i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1845:9:1845:22 | i64_sub_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1845:9:1845:31 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1845:27:1845:31 | 26i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1847:17:1847:30 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1847:34:1847:38 | 27i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1848:9:1848:22 | i64_mul_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1848:9:1848:31 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1848:27:1848:31 | 28i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1850:17:1850:30 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1850:34:1850:38 | 29i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1851:9:1851:22 | i64_div_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1851:9:1851:31 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1851:27:1851:31 | 30i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1853:17:1853:30 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1853:34:1853:38 | 31i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1854:9:1854:22 | i64_rem_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1854:9:1854:31 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1854:27:1854:31 | 32i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1857:13:1857:22 | i64_bitand |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1857:26:1857:30 | 33i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1857:26:1857:38 | ... & ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1857:34:1857:38 | 34i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:13:1858:21 | i64_bitor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:25:1858:29 | 35i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:25:1858:37 | ... \| ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1858:33:1858:37 | 36i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1859:13:1859:22 | i64_bitxor |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1859:26:1859:30 | 37i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1859:26:1859:38 | ... ^ ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1859:34:1859:38 | 38i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1860:13:1860:19 | i64_shl |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1860:23:1860:27 | 39i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1860:23:1860:36 | ... << ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1860:32:1860:36 | 40i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1861:13:1861:19 | i64_shr |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1861:23:1861:27 | 41i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1861:23:1861:36 | ... >> ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1861:32:1861:36 | 42i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1864:17:1864:33 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1864:37:1864:41 | 43i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1865:9:1865:25 | i64_bitand_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1865:9:1865:34 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1865:30:1865:34 | 44i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1867:17:1867:32 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1867:36:1867:40 | 45i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1868:9:1868:24 | i64_bitor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1868:9:1868:33 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1868:29:1868:33 | 46i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1870:17:1870:33 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1870:37:1870:41 | 47i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1871:9:1871:25 | i64_bitxor_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1871:9:1871:34 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1871:30:1871:34 | 48i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1873:17:1873:30 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1873:34:1873:38 | 49i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1874:9:1874:22 | i64_shl_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1874:9:1874:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1874:28:1874:32 | 50i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1876:17:1876:30 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1876:34:1876:38 | 51i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1877:9:1877:22 | i64_shr_assign |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1877:9:1877:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1877:28:1877:32 | 52i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1879:13:1879:19 | i64_neg |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1879:23:1879:28 | - ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1879:24:1879:28 | 53i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1880:13:1880:19 | i64_not |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1880:23:1880:28 | ! ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1880:24:1880:28 | 54i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1883:13:1883:14 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1883:18:1883:36 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1883:28:1883:28 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1883:28:1883:28 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1883:34:1883:34 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1883:34:1883:34 | 2 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1884:13:1884:14 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1884:18:1884:36 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1884:28:1884:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1884:28:1884:28 | 3 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1884:34:1884:34 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1884:34:1884:34 | 4 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1887:13:1887:19 | vec2_eq |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1887:23:1887:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1887:23:1887:30 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1887:29:1887:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1888:13:1888:19 | vec2_ne |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1888:23:1888:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1888:23:1888:30 | ... != ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1888:29:1888:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1889:13:1889:19 | vec2_lt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1889:23:1889:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1889:23:1889:29 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1889:28:1889:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1890:13:1890:19 | vec2_le |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1890:23:1890:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1890:23:1890:30 | ... <= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1890:29:1890:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1891:13:1891:19 | vec2_gt |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1891:23:1891:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1891:23:1891:29 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1891:28:1891:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1892:13:1892:19 | vec2_ge |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1892:23:1892:24 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1892:23:1892:30 | ... >= ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1892:29:1892:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1895:13:1895:20 | vec2_add |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1895:24:1895:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1895:24:1895:30 | ... + ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1895:29:1895:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1896:13:1896:20 | vec2_sub |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1896:24:1896:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1896:24:1896:30 | ... - ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1896:29:1896:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1897:13:1897:20 | vec2_mul |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1897:24:1897:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1897:24:1897:30 | ... * ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1897:29:1897:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1898:13:1898:20 | vec2_div |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1898:24:1898:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1898:24:1898:30 | ... / ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1898:29:1898:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1899:13:1899:20 | vec2_rem |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1899:24:1899:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1899:24:1899:30 | ... % ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1899:29:1899:30 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1902:17:1902:31 | vec2_add_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1902:35:1902:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1903:9:1903:23 | vec2_add_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1903:9:1903:29 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:1903:28:1903:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1905:17:1905:31 | vec2_sub_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1905:35:1905:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1906:9:1906:23 | vec2_sub_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1906:9:1906:29 | ... -= ... |  | file://:0:0:0:0 | () |
+| main.rs:1906:28:1906:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1908:17:1908:31 | vec2_mul_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1908:35:1908:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1909:9:1909:23 | vec2_mul_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1909:9:1909:29 | ... *= ... |  | file://:0:0:0:0 | () |
+| main.rs:1909:28:1909:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1911:17:1911:31 | vec2_div_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1911:35:1911:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1912:9:1912:23 | vec2_div_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1912:9:1912:29 | ... /= ... |  | file://:0:0:0:0 | () |
+| main.rs:1912:28:1912:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1914:17:1914:31 | vec2_rem_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1914:35:1914:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1915:9:1915:23 | vec2_rem_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1915:9:1915:29 | ... %= ... |  | file://:0:0:0:0 | () |
+| main.rs:1915:28:1915:29 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1918:13:1918:23 | vec2_bitand |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1918:27:1918:28 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1918:27:1918:33 | ... & ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1918:32:1918:33 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1919:13:1919:22 | vec2_bitor |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1919:26:1919:27 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1919:26:1919:32 | ... \| ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1919:31:1919:32 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1920:13:1920:23 | vec2_bitxor |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1920:27:1920:28 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1920:27:1920:33 | ... ^ ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1920:32:1920:33 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1921:13:1921:20 | vec2_shl |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1921:24:1921:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1921:24:1921:33 | ... << ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1921:30:1921:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1922:13:1922:20 | vec2_shr |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1922:24:1922:25 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1922:24:1922:33 | ... >> ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1922:30:1922:33 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1925:17:1925:34 | vec2_bitand_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1925:38:1925:39 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1926:9:1926:26 | vec2_bitand_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1926:9:1926:32 | ... &= ... |  | file://:0:0:0:0 | () |
+| main.rs:1926:31:1926:32 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1928:17:1928:33 | vec2_bitor_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1928:37:1928:38 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1929:9:1929:25 | vec2_bitor_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1929:9:1929:31 | ... \|= ... |  | file://:0:0:0:0 | () |
+| main.rs:1929:30:1929:31 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1931:17:1931:34 | vec2_bitxor_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1931:38:1931:39 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1932:9:1932:26 | vec2_bitxor_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1932:9:1932:32 | ... ^= ... |  | file://:0:0:0:0 | () |
+| main.rs:1932:31:1932:32 | v2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1934:17:1934:31 | vec2_shl_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1934:35:1934:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1935:9:1935:23 | vec2_shl_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1935:9:1935:32 | ... <<= ... |  | file://:0:0:0:0 | () |
+| main.rs:1935:29:1935:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1937:17:1937:31 | vec2_shr_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1937:35:1937:36 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1938:9:1938:23 | vec2_shr_assign |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1938:9:1938:32 | ... >>= ... |  | file://:0:0:0:0 | () |
+| main.rs:1938:29:1938:32 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:1941:13:1941:20 | vec2_neg |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1941:24:1941:26 | - ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1941:25:1941:26 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1942:13:1942:20 | vec2_not |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1942:24:1942:26 | ! ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1942:25:1942:26 | v1 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1945:13:1945:24 | default_vec2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1945:28:1945:45 | ...::default(...) |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1946:13:1946:26 | vec2_zero_plus |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1946:30:1946:48 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1946:30:1946:63 | ... + ... |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1946:40:1946:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1946:40:1946:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1946:46:1946:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1946:46:1946:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1946:52:1946:63 | default_vec2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1950:13:1950:24 | default_vec2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1950:28:1950:45 | ...::default(...) |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1951:13:1951:26 | vec2_zero_plus |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1951:30:1951:48 | Vec2 {...} |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1951:30:1951:64 | ... == ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:1951:40:1951:40 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1951:40:1951:40 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1951:46:1951:46 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:1951:46:1951:46 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:1951:53:1951:64 | default_vec2 |  | main.rs:1586:5:1591:5 | Vec2 |
+| main.rs:1961:18:1961:21 | SelfParam |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1964:25:1966:5 | { ... } |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1965:9:1965:10 | S1 |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1968:41:1970:5 | { ... } |  | main.rs:1968:16:1968:39 | ImplTraitTypeRepr |
+| main.rs:1969:9:1969:20 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1969:9:1969:20 | { ... } | Output | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1969:17:1969:18 | S1 |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1978:13:1978:42 | SelfParam |  | {EXTERNAL LOCATION} | Pin |
+| main.rs:1978:13:1978:42 | SelfParam | Ptr | file://:0:0:0:0 | & |
+| main.rs:1978:13:1978:42 | SelfParam | Ptr.&T | main.rs:1972:5:1972:14 | S2 |
+| main.rs:1979:13:1979:15 | _cx |  | file://:0:0:0:0 | & |
+| main.rs:1979:13:1979:15 | _cx | &T | {EXTERNAL LOCATION} | Context |
+| main.rs:1980:44:1982:9 | { ... } |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:1980:44:1982:9 | { ... } | T | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1981:13:1981:38 | ...::Ready(...) |  | {EXTERNAL LOCATION} | Poll |
+| main.rs:1981:13:1981:38 | ...::Ready(...) | T | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1981:36:1981:37 | S1 |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1985:41:1987:5 | { ... } |  | main.rs:1985:16:1985:39 | ImplTraitTypeRepr |
+| main.rs:1986:9:1986:10 | S2 |  | main.rs:1972:5:1972:14 | S2 |
+| main.rs:1986:9:1986:10 | S2 |  | main.rs:1985:16:1985:39 | ImplTraitTypeRepr |
+| main.rs:1990:9:1990:12 | f1(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1990:9:1990:12 | f1(...) | Output | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1990:9:1990:18 | await ... |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1991:9:1991:12 | f2(...) |  | main.rs:1968:16:1968:39 | ImplTraitTypeRepr |
+| main.rs:1991:9:1991:18 | await ... |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1992:9:1992:12 | f3(...) |  | main.rs:1985:16:1985:39 | ImplTraitTypeRepr |
+| main.rs:1992:9:1992:18 | await ... |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1993:9:1993:10 | S2 |  | main.rs:1972:5:1972:14 | S2 |
+| main.rs:1993:9:1993:16 | await S2 |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1994:13:1994:13 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1994:13:1994:13 | b | Output | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1994:17:1994:28 | { ... } |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1994:17:1994:28 | { ... } | Output | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1994:25:1994:26 | S1 |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1995:9:1995:9 | b |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:1995:9:1995:9 | b | Output | main.rs:1958:5:1958:14 | S1 |
+| main.rs:1995:9:1995:15 | await b |  | main.rs:1958:5:1958:14 | S1 |
+| main.rs:2006:15:2006:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2006:15:2006:19 | SelfParam | &T | main.rs:2005:5:2007:5 | Self [trait Trait1] |
+| main.rs:2010:15:2010:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2010:15:2010:19 | SelfParam | &T | main.rs:2009:5:2011:5 | Self [trait Trait2] |
+| main.rs:2014:15:2014:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2014:15:2014:19 | SelfParam | &T | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2018:15:2018:19 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2018:15:2018:19 | SelfParam | &T | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2021:37:2023:5 | { ... } |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2022:9:2022:10 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2022:9:2022:10 | S1 |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2026:18:2026:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2026:18:2026:22 | SelfParam | &T | main.rs:2025:5:2027:5 | Self [trait MyTrait] |
+| main.rs:2030:18:2030:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2030:18:2030:22 | SelfParam | &T | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2030:31:2032:9 | { ... } |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2031:13:2031:14 | S2 |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2036:18:2036:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2036:18:2036:22 | SelfParam |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2036:18:2036:22 | SelfParam | &T | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2036:18:2036:22 | SelfParam | &T.T3 | main.rs:2035:10:2035:17 | T |
+| main.rs:2036:30:2039:9 | { ... } |  | main.rs:2035:10:2035:17 | T |
+| main.rs:2037:17:2037:21 | S3(...) |  | file://:0:0:0:0 | & |
+| main.rs:2037:17:2037:21 | S3(...) |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2037:17:2037:21 | S3(...) | &T | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2037:17:2037:21 | S3(...) | &T.T3 | main.rs:2035:10:2035:17 | T |
+| main.rs:2037:25:2037:28 | self |  | file://:0:0:0:0 | & |
+| main.rs:2037:25:2037:28 | self |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2037:25:2037:28 | self | &T | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2037:25:2037:28 | self | &T.T3 | main.rs:2035:10:2035:17 | T |
+| main.rs:2038:13:2038:21 | t.clone() |  | main.rs:2035:10:2035:17 | T |
+| main.rs:2042:45:2044:5 | { ... } |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2043:9:2043:10 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2043:9:2043:10 | S1 |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2046:41:2046:41 | t |  | main.rs:2046:26:2046:38 | B |
+| main.rs:2046:52:2048:5 | { ... } |  | main.rs:2046:23:2046:23 | A |
+| main.rs:2047:9:2047:9 | t |  | main.rs:2046:26:2046:38 | B |
+| main.rs:2047:9:2047:17 | t.get_a() |  | main.rs:2046:23:2046:23 | A |
+| main.rs:2050:34:2050:34 | x |  | main.rs:2050:24:2050:31 | T |
+| main.rs:2050:59:2052:5 | { ... } |  | main.rs:2050:43:2050:57 | ImplTraitTypeRepr |
+| main.rs:2050:59:2052:5 | { ... } | impl(T) | main.rs:2050:24:2050:31 | T |
+| main.rs:2051:9:2051:13 | S3(...) |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2051:9:2051:13 | S3(...) |  | main.rs:2050:43:2050:57 | ImplTraitTypeRepr |
+| main.rs:2051:9:2051:13 | S3(...) | T3 | main.rs:2050:24:2050:31 | T |
+| main.rs:2051:9:2051:13 | S3(...) | impl(T) | main.rs:2050:24:2050:31 | T |
+| main.rs:2051:12:2051:12 | x |  | main.rs:2050:24:2050:31 | T |
+| main.rs:2054:34:2054:34 | x |  | main.rs:2054:24:2054:31 | T |
+| main.rs:2054:67:2056:5 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2054:67:2056:5 | { ... } | T | main.rs:2054:50:2054:64 | ImplTraitTypeRepr |
+| main.rs:2054:67:2056:5 | { ... } | T.impl(T) | main.rs:2054:24:2054:31 | T |
+| main.rs:2055:9:2055:19 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2055:9:2055:19 | Some(...) | T | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2055:9:2055:19 | Some(...) | T | main.rs:2054:50:2054:64 | ImplTraitTypeRepr |
+| main.rs:2055:9:2055:19 | Some(...) | T.T3 | main.rs:2054:24:2054:31 | T |
+| main.rs:2055:9:2055:19 | Some(...) | T.impl(T) | main.rs:2054:24:2054:31 | T |
+| main.rs:2055:14:2055:18 | S3(...) |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2055:14:2055:18 | S3(...) |  | main.rs:2054:50:2054:64 | ImplTraitTypeRepr |
+| main.rs:2055:14:2055:18 | S3(...) | T3 | main.rs:2054:24:2054:31 | T |
+| main.rs:2055:14:2055:18 | S3(...) | impl(T) | main.rs:2054:24:2054:31 | T |
+| main.rs:2055:17:2055:17 | x |  | main.rs:2054:24:2054:31 | T |
+| main.rs:2058:34:2058:34 | x |  | main.rs:2058:24:2058:31 | T |
+| main.rs:2058:78:2060:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2058:78:2060:5 | { ... } | 0(2) | main.rs:2058:44:2058:58 | ImplTraitTypeRepr |
+| main.rs:2058:78:2060:5 | { ... } | 0(2).impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2058:78:2060:5 | { ... } | 1(2) | main.rs:2058:61:2058:75 | ImplTraitTypeRepr |
+| main.rs:2058:78:2060:5 | { ... } | 1(2).impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:9:2059:30 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2059:9:2059:30 | TupleExpr | 0(2) | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2059:9:2059:30 | TupleExpr | 0(2) | main.rs:2058:44:2058:58 | ImplTraitTypeRepr |
+| main.rs:2059:9:2059:30 | TupleExpr | 0(2).T3 | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:9:2059:30 | TupleExpr | 0(2).impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:9:2059:30 | TupleExpr | 1(2) | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2059:9:2059:30 | TupleExpr | 1(2) | main.rs:2058:61:2058:75 | ImplTraitTypeRepr |
+| main.rs:2059:9:2059:30 | TupleExpr | 1(2).T3 | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:9:2059:30 | TupleExpr | 1(2).impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:10:2059:22 | S3(...) |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2059:10:2059:22 | S3(...) |  | main.rs:2058:44:2058:58 | ImplTraitTypeRepr |
+| main.rs:2059:10:2059:22 | S3(...) | T3 | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:10:2059:22 | S3(...) | impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:13:2059:13 | x |  | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:13:2059:21 | x.clone() |  | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:25:2059:29 | S3(...) |  | main.rs:2003:5:2003:22 | S3 |
+| main.rs:2059:25:2059:29 | S3(...) |  | main.rs:2058:61:2058:75 | ImplTraitTypeRepr |
+| main.rs:2059:25:2059:29 | S3(...) | T3 | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:25:2059:29 | S3(...) | impl(T) | main.rs:2058:24:2058:31 | T |
+| main.rs:2059:28:2059:28 | x |  | main.rs:2058:24:2058:31 | T |
+| main.rs:2062:26:2062:26 | t |  | main.rs:2062:29:2062:43 | ImplTraitTypeRepr |
+| main.rs:2062:51:2064:5 | { ... } |  | main.rs:2062:23:2062:23 | A |
+| main.rs:2063:9:2063:9 | t |  | main.rs:2062:29:2062:43 | ImplTraitTypeRepr |
+| main.rs:2063:9:2063:17 | t.get_a() |  | main.rs:2062:23:2062:23 | A |
+| main.rs:2067:13:2067:13 | x |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2067:17:2067:20 | f1(...) |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2068:9:2068:9 | x |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2069:9:2069:9 | x |  | main.rs:2021:16:2021:35 | ImplTraitTypeRepr |
+| main.rs:2070:13:2070:13 | a |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2070:17:2070:32 | get_a_my_trait(...) |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2071:13:2071:13 | b |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2071:17:2071:33 | uses_my_trait1(...) |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2071:32:2071:32 | a |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2072:13:2072:13 | a |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2072:17:2072:32 | get_a_my_trait(...) |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2073:13:2073:13 | c |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2073:17:2073:33 | uses_my_trait2(...) |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2073:32:2073:32 | a |  | main.rs:2042:28:2042:43 | ImplTraitTypeRepr |
+| main.rs:2074:13:2074:13 | d |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2074:17:2074:34 | uses_my_trait2(...) |  | main.rs:2002:5:2002:14 | S2 |
+| main.rs:2074:32:2074:33 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2075:13:2075:13 | e |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2075:17:2075:35 | get_a_my_trait2(...) |  | main.rs:2050:43:2050:57 | ImplTraitTypeRepr |
+| main.rs:2075:17:2075:35 | get_a_my_trait2(...) | impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2075:17:2075:43 | ... .get_a() |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2075:33:2075:34 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2078:13:2078:13 | f |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2078:17:2078:35 | get_a_my_trait3(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2078:17:2078:35 | get_a_my_trait3(...) | T | main.rs:2054:50:2054:64 | ImplTraitTypeRepr |
+| main.rs:2078:17:2078:35 | get_a_my_trait3(...) | T.impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2078:17:2078:44 | ... .unwrap() |  | main.rs:2054:50:2054:64 | ImplTraitTypeRepr |
+| main.rs:2078:17:2078:44 | ... .unwrap() | impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2078:17:2078:52 | ... .get_a() |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2078:33:2078:34 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:13:2079:13 | g |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:17:2079:35 | get_a_my_trait4(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2079:17:2079:35 | get_a_my_trait4(...) | 0(2) | main.rs:2058:44:2058:58 | ImplTraitTypeRepr |
+| main.rs:2079:17:2079:35 | get_a_my_trait4(...) | 0(2).impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:17:2079:35 | get_a_my_trait4(...) | 1(2) | main.rs:2058:61:2058:75 | ImplTraitTypeRepr |
+| main.rs:2079:17:2079:35 | get_a_my_trait4(...) | 1(2).impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:17:2079:37 | ... .0 |  | main.rs:2058:44:2058:58 | ImplTraitTypeRepr |
+| main.rs:2079:17:2079:37 | ... .0 | impl(T) | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:17:2079:45 | ... .get_a() |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2079:33:2079:34 | S1 |  | main.rs:2000:5:2001:14 | S1 |
+| main.rs:2090:16:2090:20 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2090:16:2090:20 | SelfParam | &T | main.rs:2086:5:2087:13 | S |
+| main.rs:2090:31:2092:9 | { ... } |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2091:13:2091:13 | S |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2101:26:2103:9 | { ... } |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2101:26:2103:9 | { ... } | T | main.rs:2100:10:2100:10 | T |
+| main.rs:2102:13:2102:38 | MyVec {...} |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2102:13:2102:38 | MyVec {...} | T | main.rs:2100:10:2100:10 | T |
+| main.rs:2102:27:2102:36 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2102:27:2102:36 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2102:27:2102:36 | ...::new(...) | T | main.rs:2100:10:2100:10 | T |
+| main.rs:2105:17:2105:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2105:17:2105:25 | SelfParam | &T | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2105:17:2105:25 | SelfParam | &T.T | main.rs:2100:10:2100:10 | T |
+| main.rs:2105:28:2105:32 | value |  | main.rs:2100:10:2100:10 | T |
+| main.rs:2106:13:2106:16 | self |  | file://:0:0:0:0 | & |
+| main.rs:2106:13:2106:16 | self | &T | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2106:13:2106:16 | self | &T.T | main.rs:2100:10:2100:10 | T |
+| main.rs:2106:13:2106:21 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2106:13:2106:21 | self.data | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2106:13:2106:21 | self.data | T | main.rs:2100:10:2100:10 | T |
+| main.rs:2106:28:2106:32 | value |  | main.rs:2100:10:2100:10 | T |
+| main.rs:2114:18:2114:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2114:18:2114:22 | SelfParam | &T | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2114:18:2114:22 | SelfParam | &T.T | main.rs:2110:10:2110:10 | T |
+| main.rs:2114:25:2114:29 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2114:56:2116:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:2114:56:2116:9 | { ... } | &T | main.rs:2110:10:2110:10 | T |
+| main.rs:2115:13:2115:29 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2115:13:2115:29 | &... | &T | main.rs:2110:10:2110:10 | T |
+| main.rs:2115:14:2115:17 | self |  | file://:0:0:0:0 | & |
+| main.rs:2115:14:2115:17 | self | &T | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2115:14:2115:17 | self | &T.T | main.rs:2110:10:2110:10 | T |
+| main.rs:2115:14:2115:22 | self.data |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2115:14:2115:22 | self.data | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2115:14:2115:22 | self.data | T | main.rs:2110:10:2110:10 | T |
+| main.rs:2115:14:2115:29 | ...[index] |  | main.rs:2110:10:2110:10 | T |
+| main.rs:2115:24:2115:28 | index |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2119:22:2119:26 | slice |  | file://:0:0:0:0 | & |
+| main.rs:2119:22:2119:26 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:2119:22:2119:26 | slice | &T.[T] | main.rs:2086:5:2087:13 | S |
+| main.rs:2120:13:2120:13 | x |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2120:17:2120:21 | slice |  | file://:0:0:0:0 | & |
+| main.rs:2120:17:2120:21 | slice | &T | file://:0:0:0:0 | [] |
+| main.rs:2120:17:2120:21 | slice | &T.[T] | main.rs:2086:5:2087:13 | S |
+| main.rs:2120:17:2120:24 | slice[0] |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2120:17:2120:30 | ... .foo() |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2120:23:2120:23 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2124:17:2124:19 | vec |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2124:17:2124:19 | vec | T | main.rs:2086:5:2087:13 | S |
+| main.rs:2124:23:2124:34 | ...::new(...) |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2124:23:2124:34 | ...::new(...) | T | main.rs:2086:5:2087:13 | S |
+| main.rs:2125:9:2125:11 | vec |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2125:9:2125:11 | vec | T | main.rs:2086:5:2087:13 | S |
+| main.rs:2125:18:2125:18 | S |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2126:9:2126:11 | vec |  | main.rs:2095:5:2098:5 | MyVec |
+| main.rs:2126:9:2126:11 | vec | T | main.rs:2086:5:2087:13 | S |
+| main.rs:2126:9:2126:14 | vec[0] |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2126:9:2126:20 | ... .foo() |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2126:13:2126:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2126:13:2126:13 | 0 |  | {EXTERNAL LOCATION} | usize |
+| main.rs:2128:13:2128:14 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2128:13:2128:14 | xs | [T;...] | main.rs:2086:5:2087:13 | S |
+| main.rs:2128:21:2128:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2128:26:2128:28 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2128:26:2128:28 | [...] | [T;...] | main.rs:2086:5:2087:13 | S |
+| main.rs:2128:27:2128:27 | S |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2129:13:2129:13 | x |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2129:17:2129:18 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2129:17:2129:18 | xs | [T;...] | main.rs:2086:5:2087:13 | S |
+| main.rs:2129:17:2129:21 | xs[0] |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2129:17:2129:27 | ... .foo() |  | main.rs:2086:5:2087:13 | S |
+| main.rs:2129:20:2129:20 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2131:23:2131:25 | &xs |  | file://:0:0:0:0 | & |
+| main.rs:2131:23:2131:25 | &xs | &T | file://:0:0:0:0 | [] |
+| main.rs:2131:23:2131:25 | &xs | &T | file://:0:0:0:0 | [] |
+| main.rs:2131:23:2131:25 | &xs | &T.[T;...] | main.rs:2086:5:2087:13 | S |
+| main.rs:2131:23:2131:25 | &xs | &T.[T] | main.rs:2086:5:2087:13 | S |
+| main.rs:2131:24:2131:25 | xs |  | file://:0:0:0:0 | [] |
+| main.rs:2131:24:2131:25 | xs | [T;...] | main.rs:2086:5:2087:13 | S |
+| main.rs:2137:13:2137:13 | x |  | {EXTERNAL LOCATION} | String |
+| main.rs:2137:17:2137:46 | MacroExpr |  | {EXTERNAL LOCATION} | String |
+| main.rs:2137:25:2137:35 | "Hello, {}" |  | file://:0:0:0:0 | & |
+| main.rs:2137:25:2137:35 | "Hello, {}" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2137:25:2137:45 | ...::format(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2137:25:2137:45 | ...::must_use(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2137:25:2137:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2137:25:2137:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2137:25:2137:45 | { ... } |  | {EXTERNAL LOCATION} | String |
+| main.rs:2137:38:2137:45 | "World!" |  | file://:0:0:0:0 | & |
+| main.rs:2137:38:2137:45 | "World!" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2146:19:2146:22 | SelfParam |  | main.rs:2142:5:2147:5 | Self [trait MyAdd] |
+| main.rs:2146:25:2146:27 | rhs |  | main.rs:2142:17:2142:26 | Rhs |
+| main.rs:2153:19:2153:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2153:25:2153:29 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2153:45:2155:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2154:13:2154:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2162:19:2162:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2162:25:2162:29 | value |  | file://:0:0:0:0 | & |
+| main.rs:2162:25:2162:29 | value | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2162:46:2164:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2163:13:2163:18 | * ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2163:14:2163:18 | value |  | file://:0:0:0:0 | & |
+| main.rs:2163:14:2163:18 | value | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2171:19:2171:22 | SelfParam |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2171:25:2171:29 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2171:46:2177:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2172:13:2176:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2172:13:2176:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2172:16:2172:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2172:22:2174:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2172:22:2174:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2173:17:2173:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2173:17:2173:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2174:20:2176:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2174:20:2176:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2175:17:2175:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2175:17:2175:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2186:19:2186:22 | SelfParam |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2186:19:2186:22 | SelfParam | T | main.rs:2182:10:2182:17 | T |
+| main.rs:2186:25:2186:29 | other |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2186:25:2186:29 | other | T | main.rs:2182:10:2182:17 | T |
+| main.rs:2186:54:2188:9 | { ... } |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2186:54:2188:9 | { ... } | T | main.rs:2143:9:2143:20 | Output |
+| main.rs:2187:13:2187:39 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2187:13:2187:39 | S(...) | T | main.rs:2143:9:2143:20 | Output |
+| main.rs:2187:15:2187:22 | (...) |  | main.rs:2182:10:2182:17 | T |
+| main.rs:2187:15:2187:38 | ... .my_add(...) |  | main.rs:2143:9:2143:20 | Output |
+| main.rs:2187:16:2187:19 | self |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2187:16:2187:19 | self | T | main.rs:2182:10:2182:17 | T |
+| main.rs:2187:16:2187:21 | self.0 |  | main.rs:2182:10:2182:17 | T |
+| main.rs:2187:31:2187:35 | other |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2187:31:2187:35 | other | T | main.rs:2182:10:2182:17 | T |
+| main.rs:2187:31:2187:37 | other.0 |  | main.rs:2142:5:2147:5 | Self [trait MyAdd] |
+| main.rs:2187:31:2187:37 | other.0 |  | main.rs:2182:10:2182:17 | T |
+| main.rs:2195:19:2195:22 | SelfParam |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2195:19:2195:22 | SelfParam | T | main.rs:2191:10:2191:17 | T |
+| main.rs:2195:25:2195:29 | other |  | main.rs:2191:10:2191:17 | T |
+| main.rs:2195:51:2197:9 | { ... } |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2195:51:2197:9 | { ... } | T | main.rs:2143:9:2143:20 | Output |
+| main.rs:2196:13:2196:37 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2196:13:2196:37 | S(...) | T | main.rs:2143:9:2143:20 | Output |
+| main.rs:2196:15:2196:22 | (...) |  | main.rs:2191:10:2191:17 | T |
+| main.rs:2196:15:2196:36 | ... .my_add(...) |  | main.rs:2143:9:2143:20 | Output |
+| main.rs:2196:16:2196:19 | self |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2196:16:2196:19 | self | T | main.rs:2191:10:2191:17 | T |
+| main.rs:2196:16:2196:21 | self.0 |  | main.rs:2191:10:2191:17 | T |
+| main.rs:2196:31:2196:35 | other |  | main.rs:2191:10:2191:17 | T |
+| main.rs:2207:19:2207:22 | SelfParam |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2207:19:2207:22 | SelfParam | T | main.rs:2200:14:2200:14 | T |
+| main.rs:2207:25:2207:29 | other |  | file://:0:0:0:0 | & |
+| main.rs:2207:25:2207:29 | other | &T | main.rs:2200:14:2200:14 | T |
+| main.rs:2207:55:2209:9 | { ... } |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2208:13:2208:37 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2208:15:2208:22 | (...) |  | main.rs:2200:14:2200:14 | T |
+| main.rs:2208:16:2208:19 | self |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2208:16:2208:19 | self | T | main.rs:2200:14:2200:14 | T |
+| main.rs:2208:16:2208:21 | self.0 |  | main.rs:2200:14:2200:14 | T |
+| main.rs:2208:31:2208:35 | other |  | file://:0:0:0:0 | & |
+| main.rs:2208:31:2208:35 | other | &T | main.rs:2200:14:2200:14 | T |
+| main.rs:2214:20:2214:24 | value |  | main.rs:2212:18:2212:18 | T |
+| main.rs:2219:20:2219:24 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2219:40:2221:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2220:13:2220:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2226:20:2226:24 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2226:41:2232:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2227:13:2231:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2227:13:2231:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2227:16:2227:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2227:22:2229:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2227:22:2229:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2228:17:2228:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2228:17:2228:17 | 1 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2229:20:2231:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2229:20:2231:13 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2230:17:2230:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2230:17:2230:17 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2237:21:2237:25 | value |  | main.rs:2235:19:2235:19 | T |
+| main.rs:2237:31:2237:31 | x |  | main.rs:2235:5:2238:5 | Self [trait MyFrom2] |
+| main.rs:2242:21:2242:25 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2242:33:2242:33 | _ |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2242:48:2244:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2243:13:2243:17 | value |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2249:21:2249:25 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2249:34:2249:34 | _ |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2249:49:2255:9 | { ... } |  | file://:0:0:0:0 | () |
+| main.rs:2250:13:2254:13 | if value {...} else {...} |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2250:16:2250:20 | value |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2250:22:2252:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2251:17:2251:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2252:20:2254:13 | { ... } |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2253:17:2253:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2260:15:2260:15 | x |  | main.rs:2258:5:2264:5 | Self [trait MySelfTrait] |
+| main.rs:2263:15:2263:15 | x |  | main.rs:2258:5:2264:5 | Self [trait MySelfTrait] |
+| main.rs:2268:15:2268:15 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2268:31:2270:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2269:13:2269:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2269:13:2269:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2269:17:2269:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2273:15:2273:15 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2273:32:2275:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2274:13:2274:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2274:13:2274:17 | ... + ... |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2274:17:2274:17 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2280:15:2280:15 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2280:31:2282:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2281:13:2281:13 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2281:13:2281:13 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2285:15:2285:15 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2285:32:2287:9 | { ... } |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2286:13:2286:13 | x |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2291:13:2291:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2291:22:2291:23 | 73 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2291:22:2291:23 | 73 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2292:9:2292:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2292:9:2292:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2292:18:2292:21 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2293:9:2293:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2293:9:2293:23 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2293:18:2293:22 | &5i64 |  | file://:0:0:0:0 | & |
+| main.rs:2293:18:2293:22 | &5i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2293:19:2293:22 | 5i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2294:9:2294:9 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2294:9:2294:22 | x.my_add(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2294:18:2294:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2296:9:2296:15 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2296:9:2296:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2296:9:2296:31 | ... .my_add(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2296:11:2296:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2296:24:2296:30 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2296:24:2296:30 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2296:26:2296:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2297:9:2297:15 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2297:9:2297:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2297:11:2297:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2297:24:2297:27 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2298:9:2298:15 | S(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2298:9:2298:15 | S(...) | T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2298:9:2298:29 | ... .my_add(...) |  | main.rs:2180:5:2180:19 | S |
+| main.rs:2298:11:2298:14 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2298:24:2298:28 | &3i64 |  | file://:0:0:0:0 | & |
+| main.rs:2298:24:2298:28 | &3i64 | &T | {EXTERNAL LOCATION} | i64 |
+| main.rs:2298:25:2298:28 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2300:13:2300:13 | x |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2300:17:2300:35 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2300:30:2300:34 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2301:13:2301:13 | y |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2301:17:2301:34 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2301:30:2301:33 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2302:13:2302:13 | z |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2302:22:2302:43 | ...::my_from(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2302:38:2302:42 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2303:9:2303:34 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2303:23:2303:27 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2303:30:2303:33 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2304:9:2304:33 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2304:23:2304:26 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2304:29:2304:32 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2305:9:2305:38 | ...::my_from2(...) |  | file://:0:0:0:0 | () |
+| main.rs:2305:27:2305:31 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2305:34:2305:37 | 0i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2307:9:2307:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2307:17:2307:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2308:9:2308:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2308:17:2308:21 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2309:9:2309:22 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2309:18:2309:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2310:9:2310:22 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2310:18:2310:21 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2311:9:2311:30 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2311:25:2311:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2312:9:2312:30 | ...::f2(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2312:25:2312:29 | 73i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2313:9:2313:29 | ...::f1(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2313:25:2313:28 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2314:9:2314:29 | ...::f2(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2314:25:2314:28 | true |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2322:26:2324:9 | { ... } |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2323:13:2323:25 | MyCallable {...} |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2326:17:2326:21 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2326:17:2326:21 | SelfParam | &T | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2326:31:2328:9 | { ... } |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2327:13:2327:13 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2327:13:2327:13 | 1 |  | {EXTERNAL LOCATION} | i64 |
 | main.rs:2334:13:2334:13 | i |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2334:18:2334:22 | range |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2334:18:2334:22 | range | Idx | {EXTERNAL LOCATION} | i32 |
-| main.rs:2336:13:2336:18 | range1 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2336:13:2336:18 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2337:9:2340:9 | ...::Range {...} |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2337:9:2340:9 | ...::Range {...} | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2338:20:2338:23 | 0u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2339:18:2339:22 | 10u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2341:13:2341:13 | u |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2341:13:2341:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2341:18:2341:23 | range1 |  | {EXTERNAL LOCATION} | Range |
-| main.rs:2341:18:2341:23 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
-| main.rs:2345:26:2345:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2345:29:2345:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2345:32:2345:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:13:2348:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2348:13:2348:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2348:13:2348:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:32:2348:43 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2348:32:2348:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:32:2348:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:32:2348:52 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2348:32:2348:52 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2348:32:2348:52 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:33:2348:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:39:2348:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:39:2348:39 | 2 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2348:42:2348:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2348:42:2348:42 | 3 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2349:13:2349:13 | u |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2349:13:2349:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2349:18:2349:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2349:18:2349:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2349:18:2349:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:22:2351:33 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2351:22:2351:33 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:22:2351:33 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:23:2351:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:29:2351:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:29:2351:29 | 2 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2351:32:2351:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2351:32:2351:32 | 3 |  | {EXTERNAL LOCATION} | u16 |
-| main.rs:2354:13:2354:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2354:13:2354:17 | vals5 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2354:13:2354:17 | vals5 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:13:2354:17 | vals5 | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:21:2354:43 | ...::from(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2354:21:2354:43 | ...::from(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2354:21:2354:43 | ...::from(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:21:2354:43 | ...::from(...) | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:31:2354:42 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2354:31:2354:42 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:31:2354:42 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:32:2354:35 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:38:2354:38 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:38:2354:38 | 2 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2354:41:2354:41 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2354:41:2354:41 | 3 |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2355:13:2355:13 | u |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2355:13:2355:13 | u |  | {EXTERNAL LOCATION} | u32 |
-| main.rs:2355:13:2355:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2355:18:2355:22 | vals5 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2355:18:2355:22 | vals5 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2355:18:2355:22 | vals5 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2355:18:2355:22 | vals5 | T | {EXTERNAL LOCATION} | u32 |
-| main.rs:2357:13:2357:17 | vals6 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2357:13:2357:17 | vals6 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2357:13:2357:17 | vals6 | T | file://:0:0:0:0 | & |
-| main.rs:2357:13:2357:17 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:32:2357:43 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2357:32:2357:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:32:2357:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:32:2357:60 | ... .collect() |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2357:32:2357:60 | ... .collect() | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2357:32:2357:60 | ... .collect() | T | file://:0:0:0:0 | & |
-| main.rs:2357:32:2357:60 | ... .collect() | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:33:2357:36 | 1u64 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:39:2357:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:39:2357:39 | 2 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2357:42:2357:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2357:42:2357:42 | 3 |  | {EXTERNAL LOCATION} | u64 |
-| main.rs:2358:13:2358:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2358:13:2358:13 | u | &T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2358:18:2358:22 | vals6 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2358:18:2358:22 | vals6 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2358:18:2358:22 | vals6 | T | file://:0:0:0:0 | & |
-| main.rs:2358:18:2358:22 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
-| main.rs:2360:17:2360:21 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2360:17:2360:21 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2360:17:2360:21 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2360:25:2360:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2360:25:2360:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2360:25:2360:34 | ...::new(...) | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2361:9:2361:13 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2361:9:2361:13 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2361:9:2361:13 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2361:20:2361:22 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2362:13:2362:13 | u |  | {EXTERNAL LOCATION} | u8 |
-| main.rs:2362:13:2362:13 | u |  | file://:0:0:0:0 | & |
-| main.rs:2362:18:2362:22 | vals7 |  | {EXTERNAL LOCATION} | Vec |
-| main.rs:2362:18:2362:22 | vals7 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2362:18:2362:22 | vals7 | T | {EXTERNAL LOCATION} | u8 |
-| main.rs:2364:33:2364:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:36:2364:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:45:2364:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2364:48:2364:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:17:2371:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2371:17:2371:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:17:2371:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2371:17:2371:20 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2371:17:2371:20 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2371:17:2371:20 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2371:17:2371:20 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2371:24:2371:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2371:24:2371:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2371:24:2371:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2371:24:2371:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.T | file://:0:0:0:0 | & |
-| main.rs:2371:24:2371:55 | ...::new(...) | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:9:2372:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2372:9:2372:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2372:9:2372:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2372:9:2372:12 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:9:2372:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:9:2372:12 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2372:9:2372:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:9:2372:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
-| main.rs:2372:9:2372:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:21:2372:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2372:24:2372:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2372:24:2372:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2372:24:2372:38 | ...::new(...) | T | file://:0:0:0:0 | & |
-| main.rs:2372:24:2372:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2372:33:2372:37 | "one" |  | file://:0:0:0:0 | & |
-| main.rs:2372:33:2372:37 | "one" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:9:2373:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2373:9:2373:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2373:9:2373:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2373:9:2373:12 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:9:2373:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:9:2373:12 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2373:9:2373:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:9:2373:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
-| main.rs:2373:9:2373:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:21:2373:21 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2373:24:2373:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2373:24:2373:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2373:24:2373:38 | ...::new(...) | T | file://:0:0:0:0 | & |
-| main.rs:2373:24:2373:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2373:33:2373:37 | "two" |  | file://:0:0:0:0 | & |
-| main.rs:2373:33:2373:37 | "two" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2374:13:2374:15 | key |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2374:13:2374:15 | key |  | file://:0:0:0:0 | & |
-| main.rs:2374:13:2374:15 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2374:20:2374:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2374:20:2374:23 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2374:20:2374:23 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2374:20:2374:23 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2374:20:2374:23 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2374:20:2374:30 | map1.keys() |  | {EXTERNAL LOCATION} | Keys |
-| main.rs:2374:20:2374:30 | map1.keys() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2374:20:2374:30 | map1.keys() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2374:20:2374:30 | map1.keys() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2374:20:2374:30 | map1.keys() | V.T | file://:0:0:0:0 | & |
-| main.rs:2374:20:2374:30 | map1.keys() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:13:2375:17 | value |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2375:13:2375:17 | value |  | file://:0:0:0:0 | & |
-| main.rs:2375:13:2375:17 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:13:2375:17 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:13:2375:17 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2375:13:2375:17 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:22:2375:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2375:22:2375:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2375:22:2375:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2375:22:2375:25 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:22:2375:25 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:22:2375:25 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2375:22:2375:25 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2375:22:2375:34 | map1.values() |  | {EXTERNAL LOCATION} | Values |
-| main.rs:2375:22:2375:34 | map1.values() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2375:22:2375:34 | map1.values() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2375:22:2375:34 | map1.values() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2375:22:2375:34 | map1.values() | V.T | file://:0:0:0:0 | & |
-| main.rs:2375:22:2375:34 | map1.values() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:13:2376:24 | TuplePat |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2376:13:2376:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2376:13:2376:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
-| main.rs:2376:13:2376:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:14:2376:16 | key |  | file://:0:0:0:0 | & |
-| main.rs:2376:14:2376:16 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:19:2376:23 | value |  | file://:0:0:0:0 | & |
-| main.rs:2376:19:2376:23 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:19:2376:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:19:2376:23 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2376:19:2376:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:29:2376:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2376:29:2376:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:29:2376:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2376:29:2376:32 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:29:2376:32 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:29:2376:32 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2376:29:2376:32 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2376:29:2376:39 | map1.iter() |  | {EXTERNAL LOCATION} | Iter |
-| main.rs:2376:29:2376:39 | map1.iter() | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2376:29:2376:39 | map1.iter() | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2376:29:2376:39 | map1.iter() | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2376:29:2376:39 | map1.iter() | V.T | file://:0:0:0:0 | & |
-| main.rs:2376:29:2376:39 | map1.iter() | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:13:2377:24 | TuplePat |  | {EXTERNAL LOCATION} | Item |
-| main.rs:2377:13:2377:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2377:13:2377:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
-| main.rs:2377:13:2377:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:14:2377:16 | key |  | file://:0:0:0:0 | & |
-| main.rs:2377:14:2377:16 | key | &T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:19:2377:23 | value |  | file://:0:0:0:0 | & |
-| main.rs:2377:19:2377:23 | value | &T | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:19:2377:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:19:2377:23 | value | &T.T | file://:0:0:0:0 | & |
-| main.rs:2377:19:2377:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:29:2377:33 | &map1 |  | file://:0:0:0:0 | & |
-| main.rs:2377:29:2377:33 | &map1 | &T | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2377:29:2377:33 | &map1 | &T.K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:29:2377:33 | &map1 | &T.S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2377:29:2377:33 | &map1 | &T.V | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.T | file://:0:0:0:0 | & |
-| main.rs:2377:29:2377:33 | &map1 | &T.V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2377:30:2377:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
-| main.rs:2377:30:2377:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
-| main.rs:2377:30:2377:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
-| main.rs:2377:30:2377:33 | map1 | V | {EXTERNAL LOCATION} | Box |
-| main.rs:2377:30:2377:33 | map1 | V.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2377:30:2377:33 | map1 | V.T | file://:0:0:0:0 | & |
-| main.rs:2377:30:2377:33 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
-| main.rs:2381:17:2381:17 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2381:26:2381:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2381:26:2381:26 | 0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2383:23:2383:23 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2383:23:2383:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2383:27:2383:28 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2383:27:2383:28 | 10 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2385:13:2385:13 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2385:13:2385:18 | ... += ... |  | file://:0:0:0:0 | () |
-| main.rs:2385:18:2385:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2397:40:2399:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2397:40:2399:9 | { ... } | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2397:40:2399:9 | { ... } | T.T | main.rs:2396:10:2396:19 | T |
-| main.rs:2398:13:2398:16 | None |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2398:13:2398:16 | None | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2398:13:2398:16 | None | T.T | main.rs:2396:10:2396:19 | T |
-| main.rs:2401:30:2403:9 | { ... } |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2401:30:2403:9 | { ... } | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2402:13:2402:28 | S1(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2402:13:2402:28 | S1(...) | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2402:16:2402:27 | ...::default(...) |  | main.rs:2396:10:2396:19 | T |
-| main.rs:2405:19:2405:22 | SelfParam |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2405:19:2405:22 | SelfParam | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2405:33:2407:9 | { ... } |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2405:33:2407:9 | { ... } | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2406:13:2406:16 | self |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2406:13:2406:16 | self | T | main.rs:2396:10:2396:19 | T |
-| main.rs:2418:15:2418:15 | x |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2418:26:2420:5 | { ... } |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2419:9:2419:9 | x |  | main.rs:2418:12:2418:12 | T |
-| main.rs:2423:13:2423:14 | x1 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2423:13:2423:14 | x1 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2423:13:2423:14 | x1 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2423:34:2423:48 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2424:13:2424:14 | x2 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2424:13:2424:14 | x2 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2424:13:2424:14 | x2 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2424:18:2424:38 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2425:13:2425:14 | x3 |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2425:13:2425:14 | x3 | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2425:13:2425:14 | x3 | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) | T | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2425:18:2425:32 | ...::assoc_fun(...) | T.T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:13:2426:14 | x4 |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:13:2426:14 | x4 | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:18:2426:48 | ...::method(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:18:2426:48 | ...::method(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2426:35:2426:47 | ...::default(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2426:35:2426:47 | ...::default(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:13:2427:14 | x5 |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:13:2427:14 | x5 | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:18:2427:42 | ...::method(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:18:2427:42 | ...::method(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2427:29:2427:41 | ...::default(...) |  | main.rs:2391:5:2391:20 | S1 |
-| main.rs:2427:29:2427:41 | ...::default(...) | T | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:13:2428:14 | x6 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2428:13:2428:14 | x6 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:18:2428:45 | S4::<...>(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2428:18:2428:45 | S4::<...>(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2428:27:2428:44 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:13:2429:14 | x7 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2429:13:2429:14 | x7 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:18:2429:23 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2429:18:2429:23 | S4(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2429:21:2429:22 | S2 |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2430:13:2430:14 | x8 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2430:13:2430:14 | x8 | T4 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2430:18:2430:22 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2430:18:2430:22 | S4(...) | T4 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2430:21:2430:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2431:13:2431:14 | x9 |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2431:13:2431:14 | x9 | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2431:18:2431:34 | S4(...) |  | main.rs:2412:5:2412:27 | S4 |
-| main.rs:2431:18:2431:34 | S4(...) | T4 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2431:21:2431:33 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2432:13:2432:15 | x10 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2432:13:2432:15 | x10 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2432:19:2435:9 | S5::<...> {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2432:19:2435:9 | S5::<...> {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2434:20:2434:37 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:13:2436:15 | x11 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2436:13:2436:15 | x11 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:19:2436:34 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2436:19:2436:34 | S5 {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2436:31:2436:32 | S2 |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2437:13:2437:15 | x12 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2437:13:2437:15 | x12 | T5 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2437:19:2437:33 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2437:19:2437:33 | S5 {...} | T5 | {EXTERNAL LOCATION} | i32 |
-| main.rs:2437:31:2437:31 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2438:13:2438:15 | x13 |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2438:13:2438:15 | x13 | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2438:19:2441:9 | S5 {...} |  | main.rs:2414:5:2416:5 | S5 |
-| main.rs:2438:19:2441:9 | S5 {...} | T5 | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2440:20:2440:32 | ...::default(...) |  | main.rs:2393:5:2394:14 | S2 |
-| main.rs:2442:13:2442:15 | x14 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2442:19:2442:48 | foo::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2442:30:2442:47 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2451:35:2453:9 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2451:35:2453:9 | { ... } | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2451:35:2453:9 | { ... } | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:13:2452:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2452:13:2452:26 | TupleExpr | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:13:2452:26 | TupleExpr | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:14:2452:18 | S1 {...} |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2452:21:2452:25 | S1 {...} |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2454:16:2454:19 | SelfParam |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:13:2458:13 | a |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2458:13:2458:13 | a | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:13:2458:13 | a | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2458:17:2458:30 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:17:2459:17 | b |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2459:17:2459:17 | b | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:17:2459:17 | b | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2459:21:2459:34 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:13:2460:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2460:13:2460:18 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:13:2460:18 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:14:2460:14 | c |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:17:2460:17 | d |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2460:22:2460:35 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:13:2461:22 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2461:13:2461:22 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:13:2461:22 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:18:2461:18 | e |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:21:2461:21 | f |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2461:26:2461:39 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:13:2462:26 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2462:13:2462:26 | TuplePat | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:13:2462:26 | TuplePat | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:18:2462:18 | g |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:25:2462:25 | h |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2462:30:2462:43 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:9 | a |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2464:9:2464:9 | a | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:9 | a | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2464:9:2464:11 | a.0 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:9 | b |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2465:9:2465:9 | b | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:9 | b | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2465:9:2465:11 | b.1 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2466:9:2466:9 | c |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2467:9:2467:9 | d |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2468:9:2468:9 | e |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2469:9:2469:9 | f |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2470:9:2470:9 | g |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2471:9:2471:9 | h |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2476:13:2476:13 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2476:17:2476:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2477:13:2477:13 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2477:17:2477:34 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:13:2478:16 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2478:13:2478:16 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:13:2478:16 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:20:2478:25 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2478:20:2478:25 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:20:2478:25 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2478:21:2478:21 | a |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2478:24:2478:24 | b |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2479:13:2479:13 | i |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2479:22:2479:25 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2479:22:2479:25 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2479:22:2479:25 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2479:22:2479:27 | pair.0 |  | {EXTERNAL LOCATION} | i64 |
-| main.rs:2480:13:2480:13 | j |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2480:23:2480:26 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2480:23:2480:26 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
-| main.rs:2480:23:2480:26 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
-| main.rs:2480:23:2480:28 | pair.1 |  | {EXTERNAL LOCATION} | bool |
-| main.rs:2482:13:2482:16 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2482:13:2482:16 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:13:2482:16 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:25 | [...] |  | file://:0:0:0:0 | [] |
-| main.rs:2482:20:2482:25 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:32 | ... .into() |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2482:20:2482:32 | ... .into() | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:20:2482:32 | ... .into() | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:21:2482:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2482:24:2482:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2483:15:2483:18 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2483:15:2483:18 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2483:15:2483:18 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:13:2484:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2484:13:2484:18 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:13:2484:18 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:14:2484:14 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:17:2484:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2484:30:2484:41 | "unexpected" |  | file://:0:0:0:0 | & |
-| main.rs:2484:30:2484:41 | "unexpected" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2484:30:2484:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2484:30:2484:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2485:13:2485:13 | _ |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2485:13:2485:13 | _ | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2485:13:2485:13 | _ | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2485:25:2485:34 | "expected" |  | file://:0:0:0:0 | & |
-| main.rs:2485:25:2485:34 | "expected" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2485:25:2485:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2485:25:2485:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2487:13:2487:13 | x |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:20 | pair |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2487:17:2487:20 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:20 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
-| main.rs:2487:17:2487:22 | pair.0 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2489:13:2489:13 | y |  | file://:0:0:0:0 | & |
-| main.rs:2489:13:2489:13 | y | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:13:2489:13 | y | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:13:2489:13 | y | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:17:2489:31 | &... |  | file://:0:0:0:0 | & |
-| main.rs:2489:17:2489:31 | &... | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:17:2489:31 | &... | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:17:2489:31 | &... | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) | 0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2489:18:2489:31 | ...::get_pair(...) | 1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:9 | y |  | file://:0:0:0:0 | & |
-| main.rs:2490:9:2490:9 | y | &T | file://:0:0:0:0 | (T_2) |
-| main.rs:2490:9:2490:9 | y | &T.0(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:9 | y | &T.1(2) | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2490:9:2490:11 | y.0 |  | main.rs:2447:5:2448:16 | S1 |
-| main.rs:2497:13:2497:23 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2497:13:2497:23 | boxed_value | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2497:13:2497:23 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2497:27:2497:42 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2497:27:2497:42 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2497:27:2497:42 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2497:36:2497:41 | 100i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2500:15:2500:25 | boxed_value |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2500:15:2500:25 | boxed_value | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2500:15:2500:25 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2501:13:2501:19 | box 100 |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2501:13:2501:19 | box 100 | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2501:13:2501:19 | box 100 | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2501:17:2501:19 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2502:26:2502:36 | "Boxed 100\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2502:26:2502:36 | "Boxed 100\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2502:26:2502:36 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2502:26:2502:36 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2504:13:2504:17 | box ... |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2504:13:2504:17 | box ... | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2504:13:2504:17 | box ... | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2506:26:2506:42 | "Boxed value: {}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2506:26:2506:42 | "Boxed value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2506:26:2506:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2506:26:2506:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2511:13:2511:22 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:13:2511:22 | nested_box | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:13:2511:22 | nested_box | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:13:2511:22 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:13:2511:22 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:26:2511:50 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:26:2511:50 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:26:2511:50 | ...::new(...) | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:26:2511:50 | ...::new(...) | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:26:2511:50 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:35:2511:49 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2511:35:2511:49 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2511:35:2511:49 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2511:44:2511:48 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| main.rs:2512:15:2512:24 | nested_box |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2512:15:2512:24 | nested_box | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2512:15:2512:24 | nested_box | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2512:15:2512:24 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2512:15:2512:24 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2513:13:2513:21 | box ... |  | {EXTERNAL LOCATION} | Box |
-| main.rs:2513:13:2513:21 | box ... | A | {EXTERNAL LOCATION} | Global |
-| main.rs:2513:13:2513:21 | box ... | T | {EXTERNAL LOCATION} | Box |
-| main.rs:2513:13:2513:21 | box ... | T.A | {EXTERNAL LOCATION} | Global |
-| main.rs:2513:13:2513:21 | box ... | T.T | {EXTERNAL LOCATION} | i32 |
-| main.rs:2515:26:2515:43 | "Nested boxed: {}\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2515:26:2515:43 | "Nested boxed: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2515:26:2515:59 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2515:26:2515:59 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2527:21:2527:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2527:21:2527:25 | SelfParam | &T | main.rs:2526:5:2529:5 | Self [trait Executor] |
-| main.rs:2528:24:2528:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2528:24:2528:28 | SelfParam | &T | main.rs:2526:5:2529:5 | Self [trait Executor] |
-| main.rs:2528:31:2528:35 | query |  | main.rs:2528:21:2528:21 | E |
-| main.rs:2532:21:2532:25 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2532:21:2532:25 | SelfParam | &T | main.rs:2531:10:2531:22 | T |
-| main.rs:2533:22:2533:41 | "Executor::execute1\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2533:22:2533:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2533:22:2533:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2533:22:2533:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2536:24:2536:28 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2536:24:2536:28 | SelfParam | &T | main.rs:2531:10:2531:22 | T |
-| main.rs:2536:31:2536:36 | _query |  | main.rs:2536:21:2536:21 | E |
-| main.rs:2537:22:2537:41 | "Executor::execute2\\n" |  | file://:0:0:0:0 | & |
-| main.rs:2537:22:2537:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2537:22:2537:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2537:22:2537:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| main.rs:2546:13:2546:13 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2546:17:2546:34 | MySqlConnection {...} |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2548:9:2548:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2549:35:2549:36 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2549:35:2549:36 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2549:36:2549:36 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2551:9:2551:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2551:20:2551:40 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2551:20:2551:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2552:9:2552:9 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2552:28:2552:48 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2552:28:2552:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2553:35:2553:36 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2553:35:2553:36 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2553:36:2553:36 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2553:39:2553:59 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2553:39:2553:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2554:43:2554:44 | &c |  | file://:0:0:0:0 | & |
-| main.rs:2554:43:2554:44 | &c | &T | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2554:44:2554:44 | c |  | main.rs:2541:5:2541:29 | MySqlConnection |
-| main.rs:2554:47:2554:67 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
-| main.rs:2554:47:2554:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
-| main.rs:2565:36:2567:9 | { ... } |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2566:13:2566:20 | Path {...} |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2569:29:2569:33 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2569:29:2569:33 | SelfParam | &T | main.rs:2561:5:2562:5 | Path |
-| main.rs:2569:59:2571:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2569:59:2571:9 | { ... } | E | file://:0:0:0:0 | () |
-| main.rs:2569:59:2571:9 | { ... } | T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2570:13:2570:30 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2570:13:2570:30 | Ok(...) | E | file://:0:0:0:0 | () |
-| main.rs:2570:13:2570:30 | Ok(...) | T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2570:16:2570:29 | ...::new(...) |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2578:39:2580:9 | { ... } |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2579:13:2579:23 | PathBuf {...} |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2588:18:2588:22 | SelfParam |  | file://:0:0:0:0 | & |
-| main.rs:2588:18:2588:22 | SelfParam | &T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2588:34:2592:9 | { ... } |  | file://:0:0:0:0 | & |
-| main.rs:2588:34:2592:9 | { ... } | &T | main.rs:2561:5:2562:5 | Path |
-| main.rs:2590:34:2590:44 | ...::new(...) |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2591:13:2591:17 | &path |  | file://:0:0:0:0 | & |
-| main.rs:2591:13:2591:17 | &path | &T | main.rs:2561:5:2562:5 | Path |
-| main.rs:2591:14:2591:17 | path |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2596:13:2596:17 | path1 |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2596:21:2596:31 | ...::new(...) |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2597:13:2597:17 | path2 |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2597:13:2597:17 | path2 | E | file://:0:0:0:0 | () |
-| main.rs:2597:13:2597:17 | path2 | T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2597:21:2597:25 | path1 |  | main.rs:2561:5:2562:5 | Path |
-| main.rs:2597:21:2597:40 | path1.canonicalize() |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2597:21:2597:40 | path1.canonicalize() | E | file://:0:0:0:0 | () |
-| main.rs:2597:21:2597:40 | path1.canonicalize() | T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2598:13:2598:17 | path3 |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2598:21:2598:25 | path2 |  | {EXTERNAL LOCATION} | Result |
-| main.rs:2598:21:2598:25 | path2 | E | file://:0:0:0:0 | () |
-| main.rs:2598:21:2598:25 | path2 | T | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2598:21:2598:34 | path2.unwrap() |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2600:13:2600:20 | pathbuf1 |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2600:24:2600:37 | ...::new(...) |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2601:24:2601:31 | pathbuf1 |  | main.rs:2574:5:2575:5 | PathBuf |
-| main.rs:2612:5:2612:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2613:5:2613:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2613:20:2613:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2613:41:2613:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
-| main.rs:2629:5:2629:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
+| main.rs:2334:18:2334:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2334:18:2334:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2334:19:2334:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2334:22:2334:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2334:25:2334:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2335:18:2335:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2335:18:2335:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2335:18:2335:41 | ... .map(...) |  | file://:0:0:0:0 | [] |
+| main.rs:2335:19:2335:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2335:22:2335:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2335:25:2335:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2335:32:2335:40 | \|...\| ... |  | {EXTERNAL LOCATION} | dyn FnOnce |
+| main.rs:2335:32:2335:40 | \|...\| ... | dyn(Args) | file://:0:0:0:0 | (T_1) |
+| main.rs:2335:40:2335:40 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:13:2336:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2336:13:2336:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:18:2336:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2336:18:2336:26 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:18:2336:38 | ... .into_iter() |  | {EXTERNAL LOCATION} | IntoIter |
+| main.rs:2336:18:2336:38 | ... .into_iter() | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:19:2336:19 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:22:2336:22 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2336:25:2336:25 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2338:13:2338:17 | vals1 |  | file://:0:0:0:0 | [] |
+| main.rs:2338:13:2338:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2338:13:2338:17 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2338:21:2338:31 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2338:21:2338:31 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2338:21:2338:31 | [...] | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2338:22:2338:24 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2338:27:2338:27 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2338:27:2338:27 | 2 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2338:30:2338:30 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2338:30:2338:30 | 3 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2339:13:2339:13 | u |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2339:13:2339:13 | u |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2339:18:2339:22 | vals1 |  | file://:0:0:0:0 | [] |
+| main.rs:2339:18:2339:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2339:18:2339:22 | vals1 | [T;...] | {EXTERNAL LOCATION} | u8 |
+| main.rs:2341:13:2341:17 | vals2 |  | file://:0:0:0:0 | [] |
+| main.rs:2341:13:2341:17 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2341:21:2341:29 | [1u16; 3] |  | file://:0:0:0:0 | [] |
+| main.rs:2341:21:2341:29 | [1u16; 3] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2341:22:2341:25 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2341:28:2341:28 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2342:13:2342:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2342:18:2342:22 | vals2 |  | file://:0:0:0:0 | [] |
+| main.rs:2342:18:2342:22 | vals2 | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2344:13:2344:17 | vals3 |  | file://:0:0:0:0 | [] |
+| main.rs:2344:13:2344:17 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2344:26:2344:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2344:31:2344:39 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2344:31:2344:39 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2344:31:2344:39 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2344:32:2344:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2344:32:2344:32 | 1 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2344:35:2344:35 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2344:35:2344:35 | 2 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2344:38:2344:38 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2344:38:2344:38 | 3 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2345:13:2345:13 | u |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2345:18:2345:22 | vals3 |  | file://:0:0:0:0 | [] |
+| main.rs:2345:18:2345:22 | vals3 | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2347:13:2347:17 | vals4 |  | file://:0:0:0:0 | [] |
+| main.rs:2347:13:2347:17 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2347:26:2347:26 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2347:31:2347:36 | [1; 3] |  | file://:0:0:0:0 | [] |
+| main.rs:2347:31:2347:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2347:31:2347:36 | [1; 3] | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2347:32:2347:32 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2347:32:2347:32 | 1 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2347:35:2347:35 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2348:13:2348:13 | u |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2348:18:2348:22 | vals4 |  | file://:0:0:0:0 | [] |
+| main.rs:2348:18:2348:22 | vals4 | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2350:17:2350:24 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2350:17:2350:24 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2350:17:2350:24 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2350:28:2350:48 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2350:28:2350:48 | [...] | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2350:28:2350:48 | [...] | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2350:29:2350:33 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2350:29:2350:33 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2350:36:2350:40 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2350:36:2350:40 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2350:43:2350:47 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2350:43:2350:47 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2351:13:2351:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2351:13:2351:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2351:13:2351:13 | s | &T | file://:0:0:0:0 | & |
+| main.rs:2351:13:2351:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2351:18:2351:26 | &strings1 |  | file://:0:0:0:0 | & |
+| main.rs:2351:18:2351:26 | &strings1 | &T | file://:0:0:0:0 | [] |
+| main.rs:2351:18:2351:26 | &strings1 | &T.[T;...] | file://:0:0:0:0 | & |
+| main.rs:2351:18:2351:26 | &strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2351:19:2351:26 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2351:19:2351:26 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2351:19:2351:26 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2352:13:2352:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2352:13:2352:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2352:13:2352:13 | s | &T | file://:0:0:0:0 | & |
+| main.rs:2352:13:2352:13 | s | &T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2352:18:2352:30 | &mut strings1 |  | file://:0:0:0:0 | & |
+| main.rs:2352:18:2352:30 | &mut strings1 | &T | file://:0:0:0:0 | [] |
+| main.rs:2352:18:2352:30 | &mut strings1 | &T.[T;...] | file://:0:0:0:0 | & |
+| main.rs:2352:18:2352:30 | &mut strings1 | &T.[T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2352:23:2352:30 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2352:23:2352:30 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2352:23:2352:30 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2353:13:2353:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2353:13:2353:13 | s | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2353:18:2353:25 | strings1 |  | file://:0:0:0:0 | [] |
+| main.rs:2353:18:2353:25 | strings1 | [T;...] | file://:0:0:0:0 | & |
+| main.rs:2353:18:2353:25 | strings1 | [T;...].&T | {EXTERNAL LOCATION} | str |
+| main.rs:2355:13:2355:20 | strings2 |  | file://:0:0:0:0 | [] |
+| main.rs:2355:13:2355:20 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2356:9:2360:9 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2356:9:2360:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2357:13:2357:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2357:26:2357:30 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2357:26:2357:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2358:13:2358:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2358:26:2358:30 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2358:26:2358:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2359:13:2359:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2359:26:2359:30 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2359:26:2359:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2361:13:2361:13 | s |  | {EXTERNAL LOCATION} | String |
+| main.rs:2361:18:2361:25 | strings2 |  | file://:0:0:0:0 | [] |
+| main.rs:2361:18:2361:25 | strings2 | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2363:13:2363:20 | strings3 |  | file://:0:0:0:0 | & |
+| main.rs:2363:13:2363:20 | strings3 | &T | file://:0:0:0:0 | [] |
+| main.rs:2363:13:2363:20 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2364:9:2368:9 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2364:9:2368:9 | &... | &T | file://:0:0:0:0 | [] |
+| main.rs:2364:9:2368:9 | &... | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2364:10:2368:9 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2364:10:2368:9 | [...] | [T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2365:13:2365:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2365:26:2365:30 | "foo" |  | file://:0:0:0:0 | & |
+| main.rs:2365:26:2365:30 | "foo" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2366:13:2366:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2366:26:2366:30 | "bar" |  | file://:0:0:0:0 | & |
+| main.rs:2366:26:2366:30 | "bar" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2367:13:2367:31 | ...::from(...) |  | {EXTERNAL LOCATION} | String |
+| main.rs:2367:26:2367:30 | "baz" |  | file://:0:0:0:0 | & |
+| main.rs:2367:26:2367:30 | "baz" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2369:13:2369:13 | s |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2369:13:2369:13 | s |  | file://:0:0:0:0 | & |
+| main.rs:2369:13:2369:13 | s | &T | {EXTERNAL LOCATION} | String |
+| main.rs:2369:18:2369:25 | strings3 |  | file://:0:0:0:0 | & |
+| main.rs:2369:18:2369:25 | strings3 | &T | file://:0:0:0:0 | [] |
+| main.rs:2369:18:2369:25 | strings3 | &T.[T;...] | {EXTERNAL LOCATION} | String |
+| main.rs:2371:13:2371:21 | callables |  | file://:0:0:0:0 | [] |
+| main.rs:2371:13:2371:21 | callables | [T;...] | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2371:25:2371:81 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2371:25:2371:81 | [...] | [T;...] | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2371:26:2371:42 | ...::new(...) |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2371:45:2371:61 | ...::new(...) |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2371:64:2371:80 | ...::new(...) |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2372:13:2372:13 | c |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2373:12:2373:20 | callables |  | file://:0:0:0:0 | [] |
+| main.rs:2373:12:2373:20 | callables | [T;...] | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2375:17:2375:22 | result |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2375:26:2375:26 | c |  | main.rs:2319:5:2319:24 | MyCallable |
+| main.rs:2375:26:2375:33 | c.call() |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2380:13:2380:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2380:13:2380:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2380:18:2380:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2380:18:2380:22 | 0..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2380:18:2380:22 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2380:21:2380:22 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2381:13:2381:13 | u |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2381:13:2381:13 | u | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2381:13:2381:13 | u | Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2381:18:2381:26 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2381:18:2381:26 | [...] | [T;...] | {EXTERNAL LOCATION} | Range |
+| main.rs:2381:18:2381:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2381:18:2381:26 | [...] | [T;...].Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2381:19:2381:21 | 0u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2381:19:2381:25 | 0u8..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2381:19:2381:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2381:19:2381:25 | 0u8..10 | Idx | {EXTERNAL LOCATION} | u8 |
+| main.rs:2381:24:2381:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2381:24:2381:25 | 10 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2382:13:2382:17 | range |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2382:13:2382:17 | range | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2382:21:2382:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2382:21:2382:25 | 0..10 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2382:21:2382:25 | 0..10 | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2382:24:2382:25 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2383:13:2383:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2383:13:2383:13 | i |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2383:18:2383:22 | range |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2383:18:2383:22 | range | Idx | {EXTERNAL LOCATION} | i32 |
+| main.rs:2384:13:2384:22 | range_full |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2384:26:2384:27 | .. |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2385:13:2385:13 | i |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2385:18:2385:48 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2385:19:2385:36 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2385:19:2385:36 | [...] | [T;...] | {EXTERNAL LOCATION} | i64 |
+| main.rs:2385:20:2385:23 | 1i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2385:26:2385:29 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2385:32:2385:35 | 3i64 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2385:38:2385:47 | range_full |  | {EXTERNAL LOCATION} | RangeFull |
+| main.rs:2387:13:2387:18 | range1 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2387:13:2387:18 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2388:9:2391:9 | ...::Range {...} |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2388:9:2391:9 | ...::Range {...} | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2389:20:2389:23 | 0u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2390:18:2390:22 | 10u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2392:13:2392:13 | u |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2392:13:2392:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2392:18:2392:23 | range1 |  | {EXTERNAL LOCATION} | Range |
+| main.rs:2392:18:2392:23 | range1 | Idx | {EXTERNAL LOCATION} | u16 |
+| main.rs:2396:26:2396:26 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2396:29:2396:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2396:32:2396:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2399:13:2399:18 | vals4a |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2399:13:2399:18 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2399:13:2399:18 | vals4a | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2399:32:2399:43 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2399:32:2399:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2399:32:2399:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2399:32:2399:52 | ... .to_vec() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2399:32:2399:52 | ... .to_vec() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2399:32:2399:52 | ... .to_vec() | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2399:33:2399:36 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2399:39:2399:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2399:39:2399:39 | 2 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2399:42:2399:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2399:42:2399:42 | 3 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2400:13:2400:13 | u |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2400:13:2400:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2400:18:2400:23 | vals4a |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2400:18:2400:23 | vals4a | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2400:18:2400:23 | vals4a | T | {EXTERNAL LOCATION} | u16 |
+| main.rs:2402:22:2402:33 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2402:22:2402:33 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2402:22:2402:33 | [...] | [T;...] | {EXTERNAL LOCATION} | u16 |
+| main.rs:2402:23:2402:26 | 1u16 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2402:29:2402:29 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2402:29:2402:29 | 2 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2402:32:2402:32 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2402:32:2402:32 | 3 |  | {EXTERNAL LOCATION} | u16 |
+| main.rs:2405:13:2405:17 | vals5 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2405:13:2405:17 | vals5 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2405:13:2405:17 | vals5 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2405:13:2405:17 | vals5 | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2405:21:2405:43 | ...::from(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2405:21:2405:43 | ...::from(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2405:21:2405:43 | ...::from(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2405:21:2405:43 | ...::from(...) | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2405:31:2405:42 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2405:31:2405:42 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2405:31:2405:42 | [...] | [T;...] | {EXTERNAL LOCATION} | u32 |
+| main.rs:2405:32:2405:35 | 1u32 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2405:38:2405:38 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2405:38:2405:38 | 2 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2405:41:2405:41 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2405:41:2405:41 | 3 |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2406:13:2406:13 | u |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2406:13:2406:13 | u |  | {EXTERNAL LOCATION} | u32 |
+| main.rs:2406:13:2406:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2406:18:2406:22 | vals5 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2406:18:2406:22 | vals5 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2406:18:2406:22 | vals5 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2406:18:2406:22 | vals5 | T | {EXTERNAL LOCATION} | u32 |
+| main.rs:2408:13:2408:17 | vals6 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2408:13:2408:17 | vals6 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2408:13:2408:17 | vals6 | T | file://:0:0:0:0 | & |
+| main.rs:2408:13:2408:17 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2408:32:2408:43 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2408:32:2408:43 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2408:32:2408:43 | [...] | [T;...] | {EXTERNAL LOCATION} | u64 |
+| main.rs:2408:32:2408:60 | ... .collect() |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2408:32:2408:60 | ... .collect() | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2408:32:2408:60 | ... .collect() | T | file://:0:0:0:0 | & |
+| main.rs:2408:32:2408:60 | ... .collect() | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2408:33:2408:36 | 1u64 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2408:39:2408:39 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2408:39:2408:39 | 2 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2408:42:2408:42 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2408:42:2408:42 | 3 |  | {EXTERNAL LOCATION} | u64 |
+| main.rs:2409:13:2409:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2409:13:2409:13 | u | &T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2409:18:2409:22 | vals6 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2409:18:2409:22 | vals6 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2409:18:2409:22 | vals6 | T | file://:0:0:0:0 | & |
+| main.rs:2409:18:2409:22 | vals6 | T.&T | {EXTERNAL LOCATION} | u64 |
+| main.rs:2411:17:2411:21 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2411:17:2411:21 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2411:17:2411:21 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2411:25:2411:34 | ...::new(...) |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2411:25:2411:34 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2411:25:2411:34 | ...::new(...) | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2412:9:2412:13 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2412:9:2412:13 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2412:9:2412:13 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2412:20:2412:22 | 1u8 |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2413:13:2413:13 | u |  | {EXTERNAL LOCATION} | u8 |
+| main.rs:2413:13:2413:13 | u |  | file://:0:0:0:0 | & |
+| main.rs:2413:18:2413:22 | vals7 |  | {EXTERNAL LOCATION} | Vec |
+| main.rs:2413:18:2413:22 | vals7 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2413:18:2413:22 | vals7 | T | {EXTERNAL LOCATION} | u8 |
+| main.rs:2415:33:2415:33 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2415:36:2415:36 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2415:45:2415:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2415:48:2415:48 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2422:17:2422:20 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2422:17:2422:20 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2422:17:2422:20 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2422:17:2422:20 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2422:17:2422:20 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2422:17:2422:20 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2422:17:2422:20 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2422:24:2422:55 | ...::new(...) |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2422:24:2422:55 | ...::new(...) | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2422:24:2422:55 | ...::new(...) | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2422:24:2422:55 | ...::new(...) | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2422:24:2422:55 | ...::new(...) | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2422:24:2422:55 | ...::new(...) | V.T | file://:0:0:0:0 | & |
+| main.rs:2422:24:2422:55 | ...::new(...) | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2423:9:2423:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2423:9:2423:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2423:9:2423:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2423:9:2423:12 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2423:9:2423:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2423:9:2423:12 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2423:9:2423:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2423:9:2423:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2423:9:2423:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2423:9:2423:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2423:9:2423:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
+| main.rs:2423:9:2423:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2423:21:2423:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2423:24:2423:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2423:24:2423:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2423:24:2423:38 | ...::new(...) | T | file://:0:0:0:0 | & |
+| main.rs:2423:24:2423:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2423:33:2423:37 | "one" |  | file://:0:0:0:0 | & |
+| main.rs:2423:33:2423:37 | "one" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2424:9:2424:12 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2424:9:2424:12 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2424:9:2424:12 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2424:9:2424:12 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2424:9:2424:12 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2424:9:2424:12 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2424:9:2424:12 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2424:9:2424:39 | map1.insert(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2424:9:2424:39 | map1.insert(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2424:9:2424:39 | map1.insert(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2424:9:2424:39 | map1.insert(...) | T.T | file://:0:0:0:0 | & |
+| main.rs:2424:9:2424:39 | map1.insert(...) | T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2424:21:2424:21 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2424:24:2424:38 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2424:24:2424:38 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2424:24:2424:38 | ...::new(...) | T | file://:0:0:0:0 | & |
+| main.rs:2424:24:2424:38 | ...::new(...) | T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2424:33:2424:37 | "two" |  | file://:0:0:0:0 | & |
+| main.rs:2424:33:2424:37 | "two" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2425:13:2425:15 | key |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2425:13:2425:15 | key |  | file://:0:0:0:0 | & |
+| main.rs:2425:13:2425:15 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2425:20:2425:23 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2425:20:2425:23 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2425:20:2425:23 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2425:20:2425:23 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2425:20:2425:23 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2425:20:2425:23 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2425:20:2425:23 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2425:20:2425:30 | map1.keys() |  | {EXTERNAL LOCATION} | Keys |
+| main.rs:2425:20:2425:30 | map1.keys() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2425:20:2425:30 | map1.keys() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2425:20:2425:30 | map1.keys() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2425:20:2425:30 | map1.keys() | V.T | file://:0:0:0:0 | & |
+| main.rs:2425:20:2425:30 | map1.keys() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2426:13:2426:17 | value |  | {EXTERNAL LOCATION} | Item |
+| main.rs:2426:13:2426:17 | value |  | file://:0:0:0:0 | & |
+| main.rs:2426:13:2426:17 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2426:13:2426:17 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2426:13:2426:17 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2426:13:2426:17 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2426:22:2426:25 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2426:22:2426:25 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2426:22:2426:25 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2426:22:2426:25 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2426:22:2426:25 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2426:22:2426:25 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2426:22:2426:25 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2426:22:2426:34 | map1.values() |  | {EXTERNAL LOCATION} | Values |
+| main.rs:2426:22:2426:34 | map1.values() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2426:22:2426:34 | map1.values() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2426:22:2426:34 | map1.values() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2426:22:2426:34 | map1.values() | V.T | file://:0:0:0:0 | & |
+| main.rs:2426:22:2426:34 | map1.values() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2427:13:2427:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2427:13:2427:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
+| main.rs:2427:13:2427:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2427:13:2427:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
+| main.rs:2427:13:2427:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
+| main.rs:2427:13:2427:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2427:13:2427:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
+| main.rs:2427:13:2427:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2427:14:2427:16 | key |  | file://:0:0:0:0 | & |
+| main.rs:2427:14:2427:16 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2427:19:2427:23 | value |  | file://:0:0:0:0 | & |
+| main.rs:2427:19:2427:23 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2427:19:2427:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2427:19:2427:23 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2427:19:2427:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2427:29:2427:32 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2427:29:2427:32 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2427:29:2427:32 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2427:29:2427:32 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2427:29:2427:32 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2427:29:2427:32 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2427:29:2427:32 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2427:29:2427:39 | map1.iter() |  | {EXTERNAL LOCATION} | Iter |
+| main.rs:2427:29:2427:39 | map1.iter() | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2427:29:2427:39 | map1.iter() | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2427:29:2427:39 | map1.iter() | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2427:29:2427:39 | map1.iter() | V.T | file://:0:0:0:0 | & |
+| main.rs:2427:29:2427:39 | map1.iter() | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2428:13:2428:24 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2428:13:2428:24 | TuplePat | 0(2) | file://:0:0:0:0 | & |
+| main.rs:2428:13:2428:24 | TuplePat | 0(2).&T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2428:13:2428:24 | TuplePat | 1(2) | file://:0:0:0:0 | & |
+| main.rs:2428:13:2428:24 | TuplePat | 1(2).&T | {EXTERNAL LOCATION} | Box |
+| main.rs:2428:13:2428:24 | TuplePat | 1(2).&T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2428:13:2428:24 | TuplePat | 1(2).&T.T | file://:0:0:0:0 | & |
+| main.rs:2428:13:2428:24 | TuplePat | 1(2).&T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2428:14:2428:16 | key |  | file://:0:0:0:0 | & |
+| main.rs:2428:14:2428:16 | key | &T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2428:19:2428:23 | value |  | file://:0:0:0:0 | & |
+| main.rs:2428:19:2428:23 | value | &T | {EXTERNAL LOCATION} | Box |
+| main.rs:2428:19:2428:23 | value | &T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2428:19:2428:23 | value | &T.T | file://:0:0:0:0 | & |
+| main.rs:2428:19:2428:23 | value | &T.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2428:29:2428:33 | &map1 |  | file://:0:0:0:0 | & |
+| main.rs:2428:29:2428:33 | &map1 | &T | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2428:29:2428:33 | &map1 | &T.K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2428:29:2428:33 | &map1 | &T.S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2428:29:2428:33 | &map1 | &T.V | {EXTERNAL LOCATION} | Box |
+| main.rs:2428:29:2428:33 | &map1 | &T.V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2428:29:2428:33 | &map1 | &T.V.T | file://:0:0:0:0 | & |
+| main.rs:2428:29:2428:33 | &map1 | &T.V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2428:30:2428:33 | map1 |  | {EXTERNAL LOCATION} | HashMap |
+| main.rs:2428:30:2428:33 | map1 | K | {EXTERNAL LOCATION} | i32 |
+| main.rs:2428:30:2428:33 | map1 | S | {EXTERNAL LOCATION} | RandomState |
+| main.rs:2428:30:2428:33 | map1 | V | {EXTERNAL LOCATION} | Box |
+| main.rs:2428:30:2428:33 | map1 | V.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2428:30:2428:33 | map1 | V.T | file://:0:0:0:0 | & |
+| main.rs:2428:30:2428:33 | map1 | V.T.&T | {EXTERNAL LOCATION} | str |
+| main.rs:2432:17:2432:17 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2432:26:2432:26 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2432:26:2432:26 | 0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2434:23:2434:23 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2434:23:2434:28 | ... < ... |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2434:27:2434:28 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2434:27:2434:28 | 10 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2436:13:2436:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2436:13:2436:18 | ... += ... |  | file://:0:0:0:0 | () |
+| main.rs:2436:18:2436:18 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2448:40:2450:9 | { ... } |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2448:40:2450:9 | { ... } | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2448:40:2450:9 | { ... } | T.T | main.rs:2447:10:2447:19 | T |
+| main.rs:2449:13:2449:16 | None |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2449:13:2449:16 | None | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2449:13:2449:16 | None | T.T | main.rs:2447:10:2447:19 | T |
+| main.rs:2452:30:2454:9 | { ... } |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2452:30:2454:9 | { ... } | T | main.rs:2447:10:2447:19 | T |
+| main.rs:2453:13:2453:28 | S1(...) |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2453:13:2453:28 | S1(...) | T | main.rs:2447:10:2447:19 | T |
+| main.rs:2453:16:2453:27 | ...::default(...) |  | main.rs:2447:10:2447:19 | T |
+| main.rs:2456:19:2456:22 | SelfParam |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2456:19:2456:22 | SelfParam | T | main.rs:2447:10:2447:19 | T |
+| main.rs:2456:33:2458:9 | { ... } |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2456:33:2458:9 | { ... } | T | main.rs:2447:10:2447:19 | T |
+| main.rs:2457:13:2457:16 | self |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2457:13:2457:16 | self | T | main.rs:2447:10:2447:19 | T |
+| main.rs:2469:15:2469:15 | x |  | main.rs:2469:12:2469:12 | T |
+| main.rs:2469:26:2471:5 | { ... } |  | main.rs:2469:12:2469:12 | T |
+| main.rs:2470:9:2470:9 | x |  | main.rs:2469:12:2469:12 | T |
+| main.rs:2474:13:2474:14 | x1 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2474:13:2474:14 | x1 | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2474:13:2474:14 | x1 | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2474:34:2474:48 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2474:34:2474:48 | ...::assoc_fun(...) | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2474:34:2474:48 | ...::assoc_fun(...) | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2475:13:2475:14 | x2 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2475:13:2475:14 | x2 | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2475:13:2475:14 | x2 | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2475:18:2475:38 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2475:18:2475:38 | ...::assoc_fun(...) | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2475:18:2475:38 | ...::assoc_fun(...) | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2476:13:2476:14 | x3 |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2476:13:2476:14 | x3 | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2476:13:2476:14 | x3 | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2476:18:2476:32 | ...::assoc_fun(...) |  | {EXTERNAL LOCATION} | Option |
+| main.rs:2476:18:2476:32 | ...::assoc_fun(...) | T | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2476:18:2476:32 | ...::assoc_fun(...) | T.T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2477:13:2477:14 | x4 |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2477:13:2477:14 | x4 | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2477:18:2477:48 | ...::method(...) |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2477:18:2477:48 | ...::method(...) | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2477:35:2477:47 | ...::default(...) |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2477:35:2477:47 | ...::default(...) | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2478:13:2478:14 | x5 |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2478:13:2478:14 | x5 | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2478:18:2478:42 | ...::method(...) |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2478:18:2478:42 | ...::method(...) | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2478:29:2478:41 | ...::default(...) |  | main.rs:2442:5:2442:20 | S1 |
+| main.rs:2478:29:2478:41 | ...::default(...) | T | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2479:13:2479:14 | x6 |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2479:13:2479:14 | x6 | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2479:18:2479:45 | S4::<...>(...) |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2479:18:2479:45 | S4::<...>(...) | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2479:27:2479:44 | ...::default(...) |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2480:13:2480:14 | x7 |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2480:13:2480:14 | x7 | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2480:18:2480:23 | S4(...) |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2480:18:2480:23 | S4(...) | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2480:21:2480:22 | S2 |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2481:13:2481:14 | x8 |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2481:13:2481:14 | x8 | T4 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2481:18:2481:22 | S4(...) |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2481:18:2481:22 | S4(...) | T4 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2481:21:2481:21 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2482:13:2482:14 | x9 |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2482:13:2482:14 | x9 | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2482:18:2482:34 | S4(...) |  | main.rs:2463:5:2463:27 | S4 |
+| main.rs:2482:18:2482:34 | S4(...) | T4 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2482:21:2482:33 | ...::default(...) |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2483:13:2483:15 | x10 |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2483:13:2483:15 | x10 | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2483:19:2486:9 | S5::<...> {...} |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2483:19:2486:9 | S5::<...> {...} | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2485:20:2485:37 | ...::default(...) |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2487:13:2487:15 | x11 |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2487:13:2487:15 | x11 | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2487:19:2487:34 | S5 {...} |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2487:19:2487:34 | S5 {...} | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2487:31:2487:32 | S2 |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2488:13:2488:15 | x12 |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2488:13:2488:15 | x12 | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2488:19:2488:33 | S5 {...} |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2488:19:2488:33 | S5 {...} | T5 | {EXTERNAL LOCATION} | i32 |
+| main.rs:2488:31:2488:31 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2489:13:2489:15 | x13 |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2489:13:2489:15 | x13 | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2489:19:2492:9 | S5 {...} |  | main.rs:2465:5:2467:5 | S5 |
+| main.rs:2489:19:2492:9 | S5 {...} | T5 | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2491:20:2491:32 | ...::default(...) |  | main.rs:2444:5:2445:14 | S2 |
+| main.rs:2493:13:2493:15 | x14 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2493:19:2493:48 | foo::<...>(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2493:30:2493:47 | ...::default(...) |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2502:35:2504:9 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2502:35:2504:9 | { ... } | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2502:35:2504:9 | { ... } | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2503:13:2503:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2503:13:2503:26 | TupleExpr | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2503:13:2503:26 | TupleExpr | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2503:14:2503:18 | S1 {...} |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2503:21:2503:25 | S1 {...} |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2505:16:2505:19 | SelfParam |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2509:13:2509:13 | a |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2509:13:2509:13 | a | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2509:13:2509:13 | a | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2509:17:2509:30 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2509:17:2509:30 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2509:17:2509:30 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2510:17:2510:17 | b |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2510:17:2510:17 | b | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2510:17:2510:17 | b | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2510:21:2510:34 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2510:21:2510:34 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2510:21:2510:34 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:13:2511:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2511:13:2511:18 | TuplePat | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:13:2511:18 | TuplePat | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:14:2511:14 | c |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:17:2511:17 | d |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:22:2511:35 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2511:22:2511:35 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2511:22:2511:35 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:13:2512:22 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2512:13:2512:22 | TuplePat | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:13:2512:22 | TuplePat | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:18:2512:18 | e |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:21:2512:21 | f |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:26:2512:39 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2512:26:2512:39 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2512:26:2512:39 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:13:2513:26 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2513:13:2513:26 | TuplePat | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:13:2513:26 | TuplePat | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:18:2513:18 | g |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:25:2513:25 | h |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:30:2513:43 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2513:30:2513:43 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2513:30:2513:43 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2515:9:2515:9 | a |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2515:9:2515:9 | a | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2515:9:2515:9 | a | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2515:9:2515:11 | a.0 |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2516:9:2516:9 | b |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2516:9:2516:9 | b | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2516:9:2516:9 | b | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2516:9:2516:11 | b.1 |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2517:9:2517:9 | c |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2518:9:2518:9 | d |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2519:9:2519:9 | e |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2520:9:2520:9 | f |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2521:9:2521:9 | g |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2522:9:2522:9 | h |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2527:13:2527:13 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2527:17:2527:34 | ...::default(...) |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2528:13:2528:13 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2528:17:2528:34 | ...::default(...) |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2529:13:2529:16 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2529:13:2529:16 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2529:13:2529:16 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2529:20:2529:25 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2529:20:2529:25 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2529:20:2529:25 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2529:21:2529:21 | a |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2529:24:2529:24 | b |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2530:13:2530:13 | i |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2530:22:2530:25 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2530:22:2530:25 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2530:22:2530:25 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2530:22:2530:27 | pair.0 |  | {EXTERNAL LOCATION} | i64 |
+| main.rs:2531:13:2531:13 | j |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2531:23:2531:26 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2531:23:2531:26 | pair | 0(2) | {EXTERNAL LOCATION} | i64 |
+| main.rs:2531:23:2531:26 | pair | 1(2) | {EXTERNAL LOCATION} | bool |
+| main.rs:2531:23:2531:28 | pair.1 |  | {EXTERNAL LOCATION} | bool |
+| main.rs:2533:13:2533:16 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2533:13:2533:16 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:13:2533:16 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:20:2533:25 | [...] |  | file://:0:0:0:0 | [] |
+| main.rs:2533:20:2533:25 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:20:2533:32 | ... .into() |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2533:20:2533:32 | ... .into() | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:20:2533:32 | ... .into() | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:21:2533:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2533:24:2533:24 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:15:2534:18 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2534:15:2534:18 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2534:15:2534:18 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:13:2535:18 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2535:13:2535:18 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:13:2535:18 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:14:2535:14 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:17:2535:17 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2535:30:2535:41 | "unexpected" |  | file://:0:0:0:0 | & |
+| main.rs:2535:30:2535:41 | "unexpected" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2535:30:2535:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2535:30:2535:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2536:13:2536:13 | _ |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2536:13:2536:13 | _ | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2536:13:2536:13 | _ | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2536:25:2536:34 | "expected" |  | file://:0:0:0:0 | & |
+| main.rs:2536:25:2536:34 | "expected" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2536:25:2536:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2536:25:2536:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2538:13:2538:13 | x |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2538:17:2538:20 | pair |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2538:17:2538:20 | pair | 0(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2538:17:2538:20 | pair | 1(2) | {EXTERNAL LOCATION} | i32 |
+| main.rs:2538:17:2538:22 | pair.0 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2540:13:2540:13 | y |  | file://:0:0:0:0 | & |
+| main.rs:2540:13:2540:13 | y | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2540:13:2540:13 | y | &T.0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2540:13:2540:13 | y | &T.1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2540:17:2540:31 | &... |  | file://:0:0:0:0 | & |
+| main.rs:2540:17:2540:31 | &... | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2540:17:2540:31 | &... | &T.0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2540:17:2540:31 | &... | &T.1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2540:18:2540:31 | ...::get_pair(...) |  | file://:0:0:0:0 | (T_2) |
+| main.rs:2540:18:2540:31 | ...::get_pair(...) | 0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2540:18:2540:31 | ...::get_pair(...) | 1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2541:9:2541:9 | y |  | file://:0:0:0:0 | & |
+| main.rs:2541:9:2541:9 | y | &T | file://:0:0:0:0 | (T_2) |
+| main.rs:2541:9:2541:9 | y | &T.0(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2541:9:2541:9 | y | &T.1(2) | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2541:9:2541:11 | y.0 |  | main.rs:2498:5:2499:16 | S1 |
+| main.rs:2548:13:2548:23 | boxed_value |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2548:13:2548:23 | boxed_value | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2548:13:2548:23 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2548:27:2548:42 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2548:27:2548:42 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2548:27:2548:42 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2548:36:2548:41 | 100i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2551:15:2551:25 | boxed_value |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2551:15:2551:25 | boxed_value | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2551:15:2551:25 | boxed_value | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2552:13:2552:19 | box 100 |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2552:13:2552:19 | box 100 | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2552:13:2552:19 | box 100 | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2552:17:2552:19 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2553:26:2553:36 | "Boxed 100\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2553:26:2553:36 | "Boxed 100\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2553:26:2553:36 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2553:26:2553:36 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2555:13:2555:17 | box ... |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2555:13:2555:17 | box ... | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2555:13:2555:17 | box ... | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2557:26:2557:42 | "Boxed value: {}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2557:26:2557:42 | "Boxed value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2557:26:2557:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2557:26:2557:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2562:13:2562:22 | nested_box |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2562:13:2562:22 | nested_box | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2562:13:2562:22 | nested_box | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2562:13:2562:22 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2562:13:2562:22 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2562:26:2562:50 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2562:26:2562:50 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2562:26:2562:50 | ...::new(...) | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2562:26:2562:50 | ...::new(...) | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2562:26:2562:50 | ...::new(...) | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2562:35:2562:49 | ...::new(...) |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2562:35:2562:49 | ...::new(...) | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2562:35:2562:49 | ...::new(...) | T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2562:44:2562:48 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| main.rs:2563:15:2563:24 | nested_box |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2563:15:2563:24 | nested_box | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2563:15:2563:24 | nested_box | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2563:15:2563:24 | nested_box | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2563:15:2563:24 | nested_box | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2564:13:2564:21 | box ... |  | {EXTERNAL LOCATION} | Box |
+| main.rs:2564:13:2564:21 | box ... | A | {EXTERNAL LOCATION} | Global |
+| main.rs:2564:13:2564:21 | box ... | T | {EXTERNAL LOCATION} | Box |
+| main.rs:2564:13:2564:21 | box ... | T.A | {EXTERNAL LOCATION} | Global |
+| main.rs:2564:13:2564:21 | box ... | T.T | {EXTERNAL LOCATION} | i32 |
+| main.rs:2566:26:2566:43 | "Nested boxed: {}\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2566:26:2566:43 | "Nested boxed: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2566:26:2566:59 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2566:26:2566:59 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2578:21:2578:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2578:21:2578:25 | SelfParam | &T | main.rs:2577:5:2580:5 | Self [trait Executor] |
+| main.rs:2579:24:2579:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2579:24:2579:28 | SelfParam | &T | main.rs:2577:5:2580:5 | Self [trait Executor] |
+| main.rs:2579:31:2579:35 | query |  | main.rs:2579:21:2579:21 | E |
+| main.rs:2583:21:2583:25 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2583:21:2583:25 | SelfParam | &T | main.rs:2582:10:2582:22 | T |
+| main.rs:2584:22:2584:41 | "Executor::execute1\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2584:22:2584:41 | "Executor::execute1\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2584:22:2584:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2584:22:2584:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2587:24:2587:28 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2587:24:2587:28 | SelfParam | &T | main.rs:2582:10:2582:22 | T |
+| main.rs:2587:31:2587:36 | _query |  | main.rs:2587:21:2587:21 | E |
+| main.rs:2588:22:2588:41 | "Executor::execute2\\n" |  | file://:0:0:0:0 | & |
+| main.rs:2588:22:2588:41 | "Executor::execute2\\n" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2588:22:2588:41 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2588:22:2588:41 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| main.rs:2597:13:2597:13 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2597:17:2597:34 | MySqlConnection {...} |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2599:9:2599:9 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2600:35:2600:36 | &c |  | file://:0:0:0:0 | & |
+| main.rs:2600:35:2600:36 | &c | &T | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2600:36:2600:36 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2602:9:2602:9 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2602:20:2602:40 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| main.rs:2602:20:2602:40 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2603:9:2603:9 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2603:28:2603:48 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| main.rs:2603:28:2603:48 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2604:35:2604:36 | &c |  | file://:0:0:0:0 | & |
+| main.rs:2604:35:2604:36 | &c | &T | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2604:36:2604:36 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2604:39:2604:59 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| main.rs:2604:39:2604:59 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2605:43:2605:44 | &c |  | file://:0:0:0:0 | & |
+| main.rs:2605:43:2605:44 | &c | &T | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2605:44:2605:44 | c |  | main.rs:2592:5:2592:29 | MySqlConnection |
+| main.rs:2605:47:2605:67 | "SELECT * FROM users" |  | file://:0:0:0:0 | & |
+| main.rs:2605:47:2605:67 | "SELECT * FROM users" | &T | {EXTERNAL LOCATION} | str |
+| main.rs:2615:36:2617:9 | { ... } |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2616:13:2616:19 | Path {...} |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2619:29:2619:33 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2619:29:2619:33 | SelfParam | &T | main.rs:2612:5:2612:22 | Path |
+| main.rs:2619:59:2621:9 | { ... } |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2619:59:2621:9 | { ... } | E | file://:0:0:0:0 | () |
+| main.rs:2619:59:2621:9 | { ... } | T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2620:13:2620:30 | Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2620:13:2620:30 | Ok(...) | E | file://:0:0:0:0 | () |
+| main.rs:2620:13:2620:30 | Ok(...) | T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2620:16:2620:29 | ...::new(...) |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2627:39:2629:9 | { ... } |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2628:13:2628:22 | PathBuf {...} |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2637:18:2637:22 | SelfParam |  | file://:0:0:0:0 | & |
+| main.rs:2637:18:2637:22 | SelfParam | &T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2637:34:2641:9 | { ... } |  | file://:0:0:0:0 | & |
+| main.rs:2637:34:2641:9 | { ... } | &T | main.rs:2612:5:2612:22 | Path |
+| main.rs:2639:33:2639:43 | ...::new(...) |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2640:13:2640:17 | &path |  | file://:0:0:0:0 | & |
+| main.rs:2640:13:2640:17 | &path | &T | main.rs:2612:5:2612:22 | Path |
+| main.rs:2640:14:2640:17 | path |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2645:13:2645:17 | path1 |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2645:21:2645:31 | ...::new(...) |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2646:13:2646:17 | path2 |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2646:13:2646:17 | path2 | E | file://:0:0:0:0 | () |
+| main.rs:2646:13:2646:17 | path2 | T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2646:21:2646:25 | path1 |  | main.rs:2612:5:2612:22 | Path |
+| main.rs:2646:21:2646:40 | path1.canonicalize() |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2646:21:2646:40 | path1.canonicalize() | E | file://:0:0:0:0 | () |
+| main.rs:2646:21:2646:40 | path1.canonicalize() | T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2647:13:2647:17 | path3 |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2647:21:2647:25 | path2 |  | {EXTERNAL LOCATION} | Result |
+| main.rs:2647:21:2647:25 | path2 | E | file://:0:0:0:0 | () |
+| main.rs:2647:21:2647:25 | path2 | T | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2647:21:2647:34 | path2.unwrap() |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2649:13:2649:20 | pathbuf1 |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2649:24:2649:37 | ...::new(...) |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2650:24:2650:31 | pathbuf1 |  | main.rs:2624:5:2624:25 | PathBuf |
+| main.rs:2661:5:2661:20 | ...::f(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2662:5:2662:60 | ...::g(...) |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2662:20:2662:38 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2662:41:2662:59 | ...::Foo {...} |  | main.rs:72:5:72:21 | Foo |
+| main.rs:2678:5:2678:15 | ...::f(...) |  | {EXTERNAL LOCATION} | trait Future |
 | pattern_matching.rs:13:26:133:1 | { ... } |  | {EXTERNAL LOCATION} | Option |
 | pattern_matching.rs:13:26:133:1 | { ... } | T | file://:0:0:0:0 | () |
 | pattern_matching.rs:14:9:14:13 | value |  | {EXTERNAL LOCATION} | Option |
@@ -5454,7 +5480,6 @@ inferType
 | pattern_matching.rs:264:22:264:33 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | pattern_matching.rs:269:13:269:23 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:269:27:269:30 | 5i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:270:11:270:26 | &mut ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:270:11:270:26 | &mut ref_mut_val |  | file://:0:0:0:0 | & |
 | pattern_matching.rs:270:11:270:26 | &mut ref_mut_val | &T | {EXTERNAL LOCATION} | i32 |
 | pattern_matching.rs:270:16:270:26 | ref_mut_val |  | {EXTERNAL LOCATION} | i32 |
@@ -5891,670 +5916,720 @@ inferType
 | pattern_matching.rs:482:22:482:60 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
 | pattern_matching.rs:482:22:482:60 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
 | pattern_matching.rs:482:50:482:60 | single_elem |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:488:9:488:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:488:17:488:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:491:11:491:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:492:9:492:11 | (...) |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:492:10:492:10 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:493:17:493:27 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:493:31:493:31 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:494:22:494:48 | "Parenthesized pattern: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:494:22:494:48 | "Parenthesized pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:494:22:494:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:494:22:494:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:494:51:494:61 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:9:499:13 | tuple |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:499:9:499:13 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:9:499:13 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:17:499:28 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:499:17:499:28 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:17:499:28 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:18:499:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:499:24:499:27 | 2i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:500:11:500:15 | tuple |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:500:11:500:15 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:500:11:500:15 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:9:501:16 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:501:9:501:16 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:9:501:16 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:10:501:10 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:13:501:15 | (...) |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:501:14:501:14 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:502:17:502:23 | paren_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:502:27:502:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:503:17:503:23 | paren_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:503:27:503:27 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:504:22:504:53 | "Parenthesized in tuple: {}, {... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:504:22:504:53 | "Parenthesized in tuple: {}, {... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:504:22:504:71 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:504:22:504:71 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:504:56:504:62 | paren_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:504:65:504:71 | paren_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:9:510:13 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:510:9:510:13 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:9:510:13 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:25:510:40 | &... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:510:25:510:40 | &... | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:25:510:40 | &... | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:25:510:40 | &... | &T.[T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:25:510:40 | &... | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:26:510:40 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:26:510:40 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:510:26:510:40 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:26:510:40 | [...] | [T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:27:510:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:30:510:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:33:510:33 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:36:510:36 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:510:39:510:39 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:513:11:513:15 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:513:11:513:15 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:513:11:513:15 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:514:9:514:10 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:514:9:514:10 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:514:9:514:10 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:515:17:515:27 | empty_slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:515:17:515:27 | empty_slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:515:17:515:27 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:515:31:515:35 | slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:515:31:515:35 | slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:515:31:515:35 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:516:22:516:40 | "Empty slice: {:?}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:516:22:516:40 | "Empty slice: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:516:22:516:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:516:22:516:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:516:43:516:53 | empty_slice |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:516:43:516:53 | empty_slice | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:516:43:516:53 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:518:9:518:11 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:518:9:518:11 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:518:9:518:11 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:520:22:520:41 | "Single element: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:520:22:520:41 | "Single element: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:520:22:520:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:520:22:520:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:522:9:522:23 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:522:9:522:23 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:522:9:522:23 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:525:22:525:43 | "Two elements: {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:525:22:525:43 | "Two elements: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:525:22:525:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:525:22:525:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:527:9:527:34 | SlicePat |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:527:9:527:34 | SlicePat | &T | file://:0:0:0:0 | [] |
-| pattern_matching.rs:527:9:527:34 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:532:17:532:53 | "First: {}, last: {}, middle l... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:532:17:532:53 | "First: {}, last: {}, middle l... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:532:17:535:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:532:17:535:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:541:9:541:13 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:541:9:541:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:17:541:28 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:541:17:541:28 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:18:541:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:24:541:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:541:27:541:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:542:11:542:15 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:542:11:542:15 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:543:9:543:17 | SlicePat |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:543:9:543:17 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:547:22:547:49 | "Array elements: {}, {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:547:22:547:49 | "Array elements: {}, {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:547:22:547:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:547:22:547:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:554:27:554:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:555:9:555:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:555:17:555:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:557:11:557:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:558:9:558:16 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:559:17:559:27 | const_match |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:559:31:559:35 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:560:22:560:43 | "Matches constant: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:560:22:560:43 | "Matches constant: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:560:22:560:56 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:560:22:560:56 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:560:46:560:56 | const_match |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:562:9:562:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:9:566:14 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:566:9:566:14 | option | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:18:566:38 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:566:18:566:38 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:566:33:566:37 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:567:11:567:16 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:567:11:567:16 | option | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:568:9:568:22 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:568:9:568:22 | ...::None | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:569:22:569:35 | "None variant\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:569:22:569:35 | "None variant\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:569:22:569:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:569:22:569:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:571:9:571:25 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:571:9:571:25 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:571:24:571:24 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:572:17:572:26 | some_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:572:30:572:30 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:573:22:573:37 | "Some value: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:573:22:573:37 | "Some value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:573:22:573:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:573:22:573:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:573:40:573:49 | some_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:578:11:578:51 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:578:49:578:50 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:579:9:579:34 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:579:33:579:33 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:580:17:580:24 | ok_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:580:28:580:28 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:581:22:581:35 | "Ok value: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:581:22:581:35 | "Ok value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:581:22:581:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:581:22:581:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:581:38:581:45 | ok_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) | E | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:583:9:583:35 | ...::Err(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:583:34:583:34 | e |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:584:17:584:25 | err_value |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:584:29:584:29 | e |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:585:22:585:32 | "Error: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:585:22:585:32 | "Error: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:585:22:585:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:585:22:585:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:585:35:585:43 | err_value |  | {EXTERNAL LOCATION} | usize |
-| pattern_matching.rs:591:9:591:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:591:17:591:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:594:11:594:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:9:595:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:9:595:17 | 1 \| 2 \| 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:13:595:13 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:595:17:595:17 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:596:17:596:25 | small_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:596:29:596:33 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:597:22:597:39 | "Small number: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:597:22:597:39 | "Small number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:597:22:597:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:597:22:597:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:597:42:597:50 | small_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:9:599:10 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:9:599:15 | 10 \| 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:599:14:599:15 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:600:17:600:25 | round_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:600:29:600:33 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:601:22:601:39 | "Round number: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:601:22:601:39 | "Round number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:601:22:601:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:601:22:601:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:601:42:601:50 | round_num |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:603:9:603:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:607:9:607:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:607:17:607:36 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:607:28:607:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:607:34:607:34 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:608:11:608:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:9:609:29 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:9:609:53 | ... \| ... |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:20:609:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:24:609:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:27:609:27 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:33:609:53 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:609:41:609:41 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:47:609:47 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:609:51:609:51 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:610:17:610:22 | axis_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:610:26:610:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:611:17:611:22 | axis_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:611:26:611:26 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:612:22:612:46 | "Point on axis: ({}, {})\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:612:22:612:46 | "Point on axis: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:612:22:612:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:612:22:612:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:612:49:612:54 | axis_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:612:57:612:62 | axis_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:614:9:614:9 | _ |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:618:11:618:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:14 | RangePat |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:9:619:25 | ... \| ... |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:13:619:14 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:18:619:19 | 90 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:18:619:25 | RangePat |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:619:23:619:25 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:620:17:620:30 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:620:34:620:38 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:621:22:621:35 | "In range: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:621:22:621:35 | "In range: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:621:22:621:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:621:22:621:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:621:38:621:51 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:623:9:623:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:9:628:13 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:628:9:628:13 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:9:628:13 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:9:628:13 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:9:628:13 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:17:628:41 | TupleExpr | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:628:18:628:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:628:24:628:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:628:30:628:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:628:38:628:40 | 4u8 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:631:11:631:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:631:11:631:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:631:11:631:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:631:11:631:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:631:11:631:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:632:9:632:19 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:632:9:632:19 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:634:22:634:42 | "First with rest: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:634:22:634:42 | "First with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:634:22:634:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:634:22:634:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:638:11:638:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:638:11:638:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:638:11:638:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:638:11:638:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:638:11:638:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:639:9:639:18 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:639:9:639:18 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:641:22:641:41 | "Last with rest: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:641:22:641:41 | "Last with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:641:22:641:52 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:641:22:641:52 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:645:11:645:15 | tuple |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:645:11:645:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:645:11:645:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:645:11:645:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:645:11:645:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:646:9:646:25 | TuplePat |  | file://:0:0:0:0 | (T_4) |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:646:9:646:25 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:649:22:649:45 | "First and last: {}, {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:649:22:649:45 | "First and last: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:649:22:649:67 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:649:22:649:67 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:654:9:654:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:654:17:654:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:654:28:654:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:654:35:654:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:655:11:655:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:656:9:656:23 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:656:17:656:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:657:17:657:22 | rest_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:657:26:657:26 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:658:22:658:39 | "X coordinate: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:658:22:658:39 | "X coordinate: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:658:22:658:47 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:658:22:658:47 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:658:42:658:47 | rest_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:665:17:665:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:666:17:666:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:21:681:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:21:681:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:681:28:681:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:21:682:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:21:682:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:682:28:682:28 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:9:687:20 | complex_data |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:687:9:687:20 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:9:687:20 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:9:687:20 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:24:687:79 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:24:687:79 | TupleExpr | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:25:687:44 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:687:36:687:36 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:42:687:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:47:687:78 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:687:47:687:78 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:62:687:77 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:687:68:687:70 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:68:687:70 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:687:73:687:73 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:73:687:73 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:687:76:687:76 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:687:76:687:76 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:689:11:689:22 | complex_data |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:689:11:689:22 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:689:11:689:22 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:689:11:689:22 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:9:691:61 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:691:9:691:61 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:10:691:26 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:691:21:691:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:24:691:24 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:29:691:60 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:691:29:691:60 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:44:691:59 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:691:50:691:52 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:691:50:691:52 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:691:55:691:55 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:691:58:691:58 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:692:17:692:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:692:28:692:28 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:693:17:693:24 | nested_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:693:28:693:28 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:694:17:694:24 | nested_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:694:28:694:28 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:696:17:696:57 | "Complex nested: y={}, green={... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:696:17:696:57 | "Complex nested: y={}, green={... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:696:17:697:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:696:17:697:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:697:17:697:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:697:27:697:34 | nested_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:697:37:697:44 | nested_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:701:9:701:41 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:9:701:41 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:9:701:71 | ... \| ... |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:9:701:71 | ... \| ... | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:10:701:24 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:18:701:18 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:27:701:40 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:27:701:40 | ...::None | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:45:701:71 | TuplePat |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:45:701:71 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:701:46:701:67 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:701:57:701:57 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:61:701:61 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:701:70:701:70 | _ |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:701:70:701:70 | _ | T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:702:17:702:29 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:702:33:702:33 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:703:22:703:50 | "Alternative complex: x={:?}\\n... |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:703:22:703:50 | "Alternative complex: x={:?}\\n... | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:703:22:703:65 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:703:22:703:65 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:703:53:703:65 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:706:9:706:13 | other |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:706:9:706:13 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:706:9:706:13 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:706:9:706:13 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:707:17:707:29 | other_complex |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:707:17:707:29 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:707:17:707:29 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:707:17:707:29 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:707:33:707:37 | other |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:707:33:707:37 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:707:33:707:37 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:707:33:707:37 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:708:22:708:47 | "Other complex data: {:?}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:708:22:708:47 | "Other complex data: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:708:22:708:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:708:22:708:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:708:50:708:62 | other_complex |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:708:50:708:62 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:708:50:708:62 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:708:50:708:62 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:715:9:715:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:715:17:715:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:715:28:715:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:715:35:715:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:9:716:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:716:17:716:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:20:716:20 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:716:26:716:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:717:9:717:13 | let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:717:17:717:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:718:9:718:13 | let_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:718:17:718:17 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:9:720:13 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:720:9:720:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:9:720:13 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:9:720:13 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:17:720:36 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:720:18:720:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:720:24:720:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:720:30:720:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:9:721:17 | TuplePat |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:9:721:17 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:10:721:10 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:13:721:13 | b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:16:721:16 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:721:21:721:25 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:721:21:721:25 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:721:21:721:25 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:721:21:721:25 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:722:9:722:13 | let_a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:722:17:722:17 | a |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:723:9:723:13 | let_b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:723:17:723:17 | b |  | {EXTERNAL LOCATION} | i64 |
-| pattern_matching.rs:724:9:724:13 | let_c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:724:17:724:17 | c |  | {EXTERNAL LOCATION} | f32 |
-| pattern_matching.rs:726:9:726:13 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:726:9:726:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:17:726:34 | [...] |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:726:17:726:34 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:18:726:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:24:726:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:27:726:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:30:726:30 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:726:33:726:33 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:727:9:727:25 | SlicePat |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:727:9:727:25 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:727:29:727:33 | array |  | file://:0:0:0:0 | [] |
-| pattern_matching.rs:727:29:727:33 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:9:731:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:731:17:731:34 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:731:23:731:25 | 255 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:23:731:25 | 255 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:731:28:731:30 | 128 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:28:731:30 | 128 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:731:33:731:33 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:731:33:731:33 | 0 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:9:732:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:732:15:732:15 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:18:732:18 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:21:732:21 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:732:26:732:30 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:733:9:733:13 | let_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:733:17:733:17 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:734:9:734:13 | let_g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:734:17:734:17 | g |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:735:9:735:13 | let_b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:735:17:735:17 | b |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:738:9:738:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:738:17:738:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:739:13:739:19 | ref_val |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:739:13:739:19 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:739:23:739:27 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:740:9:740:15 | let_ref |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:740:9:740:15 | let_ref | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:740:19:740:25 | ref_val |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:740:19:740:25 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:743:13:743:19 | mut_val |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:743:23:743:27 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:744:9:744:15 | let_mut |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:744:19:744:25 | mut_val |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:22:750:35 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:750:30:750:30 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:33:750:33 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:59:754:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:750:59:754:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:750:59:754:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:751:13:751:19 | param_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:751:23:751:23 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:752:13:752:19 | param_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:752:23:752:23 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:9:753:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:753:9:753:26 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:9:753:26 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:10:753:16 | param_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:753:19:753:25 | param_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:756:22:756:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:756:28:756:28 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:31:756:31 | _ |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:34:756:34 | _ |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:756:51:759:5 | { ... } |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:757:13:757:19 | param_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:757:23:757:23 | r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:758:9:758:15 | param_r |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:761:22:761:38 | TuplePat |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:761:22:761:38 | TuplePat | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:761:23:761:27 | first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:30:761:30 | _ |  | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:761:33:761:37 | third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:761:74:765:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:761:74:765:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:761:74:765:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:762:13:762:23 | param_first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:762:27:762:31 | first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:763:13:763:23 | param_third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:763:27:763:31 | third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:764:9:764:34 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:764:9:764:34 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:764:9:764:34 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:764:10:764:20 | param_first |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:764:23:764:33 | param_third |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:768:9:768:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:768:17:768:37 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:768:28:768:28 | 5 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:768:34:768:35 | 10 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:9:769:17 | extracted |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:769:9:769:17 | extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:9:769:17 | extracted | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:21:769:40 | extract_point(...) | 1(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:769:35:769:39 | point |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:771:9:771:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:771:17:771:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:771:23:771:25 | 200 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:23:771:25 | 200 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:771:28:771:30 | 100 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:28:771:30 | 100 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:771:33:771:34 | 50 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:771:33:771:34 | 50 |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:9:772:11 | red |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:15:772:34 | extract_color(...) |  | {EXTERNAL LOCATION} | u8 |
-| pattern_matching.rs:772:29:772:33 | color |  | pattern_matching.rs:142:1:143:25 | Color |
-| pattern_matching.rs:774:9:774:13 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:774:9:774:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:9:774:13 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:9:774:13 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:774:17:774:38 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:17:774:38 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:774:18:774:22 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:774:25:774:31 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:774:34:774:37 | true |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:9:775:23 | tuple_extracted | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) |  | file://:0:0:0:0 | (T_2) |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:27:775:46 | extract_tuple(...) | 1(2) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:775:41:775:45 | tuple |  | file://:0:0:0:0 | (T_3) |
-| pattern_matching.rs:775:41:775:45 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:775:41:775:45 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
-| pattern_matching.rs:775:41:775:45 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:781:23:781:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:23:781:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:34:781:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:40:781:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:45:781:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:45:781:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:781:56:781:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:781:62:781:62 | 4 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:9:782:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
-| pattern_matching.rs:782:17:782:17 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:782:20:782:20 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:783:13:783:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:783:22:783:22 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:784:13:784:18 | loop_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:784:22:784:22 | y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:785:18:785:42 | "Point in loop: ({}, {})\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:785:18:785:42 | "Point in loop: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:785:18:785:58 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:785:18:785:58 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:785:45:785:50 | loop_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:785:53:785:58 | loop_y |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:9:789:20 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:789:9:789:20 | option_value | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:24:789:44 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:789:24:789:44 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:789:39:789:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:12:790:33 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:790:12:790:33 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:27:790:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:31:790:32 | 42 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:790:37:790:48 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
-| pattern_matching.rs:790:37:790:48 | option_value | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:791:13:791:20 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:791:24:791:24 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:792:18:792:44 | "If let with @ pattern: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:792:18:792:44 | "If let with @ pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:792:18:792:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:792:18:792:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:792:47:792:54 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:13:796:17 | stack |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:796:13:796:17 | stack | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:796:13:796:17 | stack | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:31:796:46 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:796:31:796:46 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:796:31:796:46 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:36:796:39 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:42:796:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:796:45:796:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:15:797:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:797:15:797:21 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:20:797:20 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:25:797:29 | stack |  | {EXTERNAL LOCATION} | Vec |
-| pattern_matching.rs:797:25:797:29 | stack | A | {EXTERNAL LOCATION} | Global |
-| pattern_matching.rs:797:25:797:29 | stack | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:797:25:797:35 | stack.pop() |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:797:25:797:35 | stack.pop() | T | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:798:13:798:23 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:798:27:798:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:799:18:799:29 | "Popped: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:799:18:799:29 | "Popped: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:799:18:799:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:799:18:799:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:799:32:799:42 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:803:9:803:13 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:803:17:803:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:804:11:804:15 | value |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:9:805:9 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:14:805:14 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:805:14:805:18 | ... > ... |  | {EXTERNAL LOCATION} | bool |
-| pattern_matching.rs:805:18:805:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:806:17:806:23 | guard_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:806:27:806:27 | x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:807:22:807:35 | "Positive: {}\\n" |  | file://:0:0:0:0 | & |
-| pattern_matching.rs:807:22:807:35 | "Positive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
-| pattern_matching.rs:807:22:807:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:807:22:807:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
-| pattern_matching.rs:807:38:807:44 | guard_x |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:809:9:809:9 | _ |  | {EXTERNAL LOCATION} | i32 |
-| pattern_matching.rs:814:5:814:7 | f(...) |  | {EXTERNAL LOCATION} | Option |
-| pattern_matching.rs:814:5:814:7 | f(...) | T | file://:0:0:0:0 | () |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:9:487:18 | ref_tuple1 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:35:487:41 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:487:35:487:41 | &... | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:35:487:41 | &... | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:35:487:41 | &... | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:36:487:41 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:487:36:487:41 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:36:487:41 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:37:487:37 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:487:40:487:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:488:12:488:17 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:488:21:488:30 | ref_tuple1 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:489:18:489:24 | "n: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:489:18:489:24 | "n: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:489:18:489:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:489:18:489:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:490:18:490:24 | "m: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:490:18:490:24 | "m: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:490:18:490:27 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:490:18:490:27 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:9:494:18 | ref_tuple2 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:35:494:41 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:494:35:494:41 | &... | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:35:494:41 | &... | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:35:494:41 | &... | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:36:494:41 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:494:36:494:41 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:36:494:41 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:37:494:37 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:494:40:494:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:495:9:495:14 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T.0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:495:18:495:27 | ref_tuple2 | &T.1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:496:14:496:20 | "n: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:496:14:496:20 | "n: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:496:14:496:23 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:496:14:496:23 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:497:14:497:20 | "m: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:497:14:497:20 | "m: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:497:14:497:23 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:497:14:497:23 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:501:9:501:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:501:17:501:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:504:11:504:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:505:9:505:11 | (...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:505:10:505:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:506:17:506:27 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:506:31:506:31 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:507:22:507:48 | "Parenthesized pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:507:22:507:61 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:507:22:507:61 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:507:51:507:61 | paren_bound |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:9:512:13 | tuple |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:512:9:512:13 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:9:512:13 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:17:512:28 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:512:17:512:28 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:17:512:28 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:18:512:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:512:24:512:27 | 2i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:513:11:513:15 | tuple |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:513:11:513:15 | tuple | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:513:11:513:15 | tuple | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:9:514:16 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:514:9:514:16 | TuplePat | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:9:514:16 | TuplePat | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:10:514:10 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:13:514:15 | (...) |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:514:14:514:14 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:515:17:515:23 | paren_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:515:27:515:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:516:17:516:23 | paren_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:516:27:516:27 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:517:22:517:53 | "Parenthesized in tuple: {}, {... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:517:22:517:71 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:517:22:517:71 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:517:56:517:62 | paren_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:517:65:517:71 | paren_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:9:523:13 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:523:9:523:13 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:9:523:13 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:25:523:40 | &... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:523:25:523:40 | &... | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:25:523:40 | &... | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:25:523:40 | &... | &T.[T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:25:523:40 | &... | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:26:523:40 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:523:26:523:40 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:27:523:27 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:30:523:30 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:33:523:33 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:36:523:36 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:523:39:523:39 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:526:11:526:15 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:526:11:526:15 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:526:11:526:15 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:527:9:527:10 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:527:9:527:10 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:527:9:527:10 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:528:17:528:27 | empty_slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:528:17:528:27 | empty_slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:528:17:528:27 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:528:31:528:35 | slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:528:31:528:35 | slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:528:31:528:35 | slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:529:22:529:40 | "Empty slice: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:529:22:529:53 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:529:22:529:53 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:529:43:529:53 | empty_slice |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:529:43:529:53 | empty_slice | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:529:43:529:53 | empty_slice | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:531:9:531:11 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:531:9:531:11 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:531:9:531:11 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:533:22:533:41 | "Single element: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:533:22:533:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:533:22:533:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:535:9:535:23 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:535:9:535:23 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:535:9:535:23 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:538:22:538:43 | "Two elements: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:538:22:538:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:538:22:538:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:540:9:540:34 | SlicePat |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:540:9:540:34 | SlicePat | &T | file://:0:0:0:0 | [] |
+| pattern_matching.rs:540:9:540:34 | SlicePat | &T.[T] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:545:17:545:53 | "First: {}, last: {}, middle l... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:545:17:548:34 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:545:17:548:34 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:554:9:554:13 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:554:9:554:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:17:554:28 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:554:17:554:28 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:18:554:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:24:554:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:554:27:554:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:555:11:555:15 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:555:11:555:15 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:556:9:556:17 | SlicePat |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:556:9:556:17 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:560:22:560:49 | "Array elements: {}, {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:560:22:560:70 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:560:22:560:70 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:567:27:567:28 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:568:9:568:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:568:17:568:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:570:11:570:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:571:9:571:16 | CONSTANT |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:572:17:572:27 | const_match |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:572:31:572:35 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:573:22:573:43 | "Matches constant: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:573:22:573:56 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:573:22:573:56 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:573:46:573:56 | const_match |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:575:9:575:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:579:9:579:14 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:579:9:579:14 | option | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:579:18:579:38 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:579:18:579:38 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:579:33:579:37 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:580:11:580:16 | option |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:580:11:580:16 | option | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:581:9:581:22 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:581:9:581:22 | ...::None | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:582:22:582:35 | "None variant\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:582:22:582:35 | "None variant\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:582:22:582:35 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:582:22:582:35 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:584:9:584:25 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:584:9:584:25 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:584:24:584:24 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:585:17:585:26 | some_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:585:30:585:30 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:586:22:586:37 | "Some value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:586:22:586:49 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:586:22:586:49 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:586:40:586:49 | some_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:591:11:591:51 | ...::Ok::<...>(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:591:49:591:50 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:592:9:592:34 | ...::Ok(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:592:33:592:33 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:593:17:593:24 | ok_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:593:28:593:28 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:594:22:594:35 | "Ok value: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:594:22:594:45 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:594:22:594:45 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:594:38:594:45 | ok_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) |  | {EXTERNAL LOCATION} | Result |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) | E | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:596:9:596:35 | ...::Err(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:596:34:596:34 | e |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:597:17:597:25 | err_value |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:597:29:597:29 | e |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:598:22:598:32 | "Error: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:598:22:598:32 | "Error: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:598:22:598:43 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:598:22:598:43 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:598:35:598:43 | err_value |  | {EXTERNAL LOCATION} | usize |
+| pattern_matching.rs:604:9:604:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:604:17:604:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:607:11:607:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:9:608:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:9:608:17 | 1 \| 2 \| 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:13:608:13 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:608:17:608:17 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:609:17:609:25 | small_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:609:29:609:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:610:22:610:39 | "Small number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:610:22:610:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:610:22:610:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:610:42:610:50 | small_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:9:612:10 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:9:612:15 | 10 \| 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:612:14:612:15 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:613:17:613:25 | round_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:613:29:613:33 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:614:22:614:39 | "Round number: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:614:22:614:50 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:614:22:614:50 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:614:42:614:50 | round_num |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:616:9:616:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:620:9:620:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:620:17:620:36 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:620:28:620:28 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:620:34:620:34 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:621:11:621:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:9:622:29 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:9:622:53 | ... \| ... |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:20:622:20 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:24:622:24 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:27:622:27 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:33:622:53 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:622:41:622:41 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:47:622:47 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:622:51:622:51 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:623:17:623:22 | axis_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:623:26:623:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:624:17:624:22 | axis_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:624:26:624:26 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:625:22:625:46 | "Point on axis: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:625:22:625:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:625:22:625:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:625:49:625:54 | axis_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:625:57:625:62 | axis_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:627:9:627:9 | _ |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:631:11:631:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:9 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:14 | RangePat |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:9:632:25 | ... \| ... |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:13:632:14 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:18:632:19 | 90 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:18:632:25 | RangePat |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:632:23:632:25 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:633:17:633:30 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:633:34:633:38 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:634:22:634:35 | "In range: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:634:22:634:35 | "In range: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:634:22:634:51 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:634:22:634:51 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:634:38:634:51 | range_or_value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:636:9:636:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:9:641:13 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:641:9:641:13 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:9:641:13 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:9:641:13 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:9:641:13 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:17:641:41 | TupleExpr | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:641:18:641:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:641:24:641:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:641:30:641:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:641:38:641:40 | 4u8 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:644:11:644:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:644:11:644:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:644:11:644:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:644:11:644:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:644:11:644:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:645:9:645:19 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:645:9:645:19 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:647:22:647:42 | "First with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:647:22:647:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:647:22:647:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:651:11:651:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:651:11:651:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:651:11:651:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:651:11:651:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:651:11:651:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:652:9:652:18 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:652:9:652:18 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:654:22:654:41 | "Last with rest: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:654:22:654:52 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:654:22:654:52 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:658:11:658:15 | tuple |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:658:11:658:15 | tuple | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:658:11:658:15 | tuple | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:658:11:658:15 | tuple | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:658:11:658:15 | tuple | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:659:9:659:25 | TuplePat |  | file://:0:0:0:0 | (T_4) |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 0(4) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 1(4) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 2(4) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:659:9:659:25 | TuplePat | 3(4) | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:662:22:662:45 | "First and last: {}, {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:662:22:662:67 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:662:22:662:67 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:667:9:667:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:667:17:667:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:667:28:667:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:667:35:667:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:668:11:668:15 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:669:9:669:23 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:669:17:669:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:670:17:670:22 | rest_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:670:26:670:26 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:671:22:671:39 | "X coordinate: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:671:22:671:47 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:671:22:671:47 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:671:42:671:47 | rest_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:678:17:678:18 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:679:17:679:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:21:694:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:21:694:25 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:694:28:694:29 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:21:695:25 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:695:28:695:28 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:9:700:20 | complex_data |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:700:9:700:20 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:9:700:20 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:9:700:20 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:24:700:79 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:24:700:79 | TupleExpr | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:25:700:44 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:700:36:700:36 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:42:700:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:47:700:78 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:700:47:700:78 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:62:700:77 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:700:68:700:70 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:68:700:70 | 255 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:700:73:700:73 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:73:700:73 | 0 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:700:76:700:76 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:700:76:700:76 | 0 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:702:11:702:22 | complex_data |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:702:11:702:22 | complex_data | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:702:11:702:22 | complex_data | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:702:11:702:22 | complex_data | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:9:704:61 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:704:9:704:61 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:10:704:26 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:704:21:704:21 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:24:704:24 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:29:704:60 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:704:29:704:60 | ...::Some(...) | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:44:704:59 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:704:50:704:52 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:704:50:704:52 | 255 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:704:55:704:55 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:704:58:704:58 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:705:17:705:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:705:28:705:28 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:706:17:706:24 | nested_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:706:28:706:28 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:707:17:707:24 | nested_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:707:28:707:28 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:709:17:709:57 | "Complex nested: y={}, green={... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:709:17:710:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:709:17:710:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:710:17:710:24 | nested_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:710:27:710:34 | nested_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:710:37:710:44 | nested_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:714:9:714:41 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:9:714:41 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:9:714:71 | ... \| ... |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:9:714:71 | ... \| ... | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:10:714:24 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:18:714:18 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:27:714:40 | ...::None |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:27:714:40 | ...::None | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:45:714:71 | TuplePat |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:45:714:71 | TuplePat | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:714:46:714:67 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:714:57:714:57 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:61:714:61 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:714:70:714:70 | _ |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:714:70:714:70 | _ | T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:715:17:715:29 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:715:33:715:33 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:716:22:716:50 | "Alternative complex: x={:?}\\n... | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:716:22:716:65 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:716:22:716:65 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:716:53:716:65 | alt_complex_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:719:9:719:13 | other |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:719:9:719:13 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:719:9:719:13 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:719:9:719:13 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:720:17:720:29 | other_complex |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:720:17:720:29 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:720:17:720:29 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:720:17:720:29 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:720:33:720:37 | other |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:720:33:720:37 | other | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:720:33:720:37 | other | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:720:33:720:37 | other | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:721:22:721:47 | "Other complex data: {:?}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:721:22:721:62 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:721:22:721:62 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:721:50:721:62 | other_complex |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:721:50:721:62 | other_complex | 0(2) | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:721:50:721:62 | other_complex | 1(2) | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:721:50:721:62 | other_complex | 1(2).T | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:728:9:728:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:728:17:728:38 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:728:28:728:29 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:728:35:728:36 | 20 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:9:729:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:729:17:729:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:20:729:20 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:729:26:729:30 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:730:9:730:13 | let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:730:17:730:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:731:9:731:13 | let_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:731:17:731:17 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:9:733:13 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:733:9:733:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:9:733:13 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:9:733:13 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:17:733:36 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:733:18:733:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:733:24:733:27 | 2i64 |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:733:30:733:35 | 3.0f32 |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:9:734:17 | TuplePat |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:9:734:17 | TuplePat | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:10:734:10 | a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:13:734:13 | b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:16:734:16 | c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:734:21:734:25 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:734:21:734:25 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:734:21:734:25 | tuple | 1(3) | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:734:21:734:25 | tuple | 2(3) | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:735:9:735:13 | let_a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:735:17:735:17 | a |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:736:9:736:13 | let_b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:736:17:736:17 | b |  | {EXTERNAL LOCATION} | i64 |
+| pattern_matching.rs:737:9:737:13 | let_c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:737:17:737:17 | c |  | {EXTERNAL LOCATION} | f32 |
+| pattern_matching.rs:739:9:739:13 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:739:9:739:13 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:17:739:34 | [...] |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:739:17:739:34 | [...] | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:18:739:21 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:24:739:24 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:27:739:27 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:30:739:30 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:739:33:739:33 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:740:9:740:25 | SlicePat |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:740:9:740:25 | SlicePat | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:740:29:740:33 | array |  | file://:0:0:0:0 | [] |
+| pattern_matching.rs:740:29:740:33 | array | [T;...] | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:9:744:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:744:17:744:34 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:744:23:744:25 | 255 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:23:744:25 | 255 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:744:28:744:30 | 128 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:28:744:30 | 128 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:744:33:744:33 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:744:33:744:33 | 0 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:9:745:22 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:745:15:745:15 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:18:745:18 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:21:745:21 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:745:26:745:30 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:746:9:746:13 | let_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:746:17:746:17 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:747:9:747:13 | let_g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:747:17:747:17 | g |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:748:9:748:13 | let_b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:748:17:748:17 | b |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:751:9:751:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:751:17:751:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:752:13:752:19 | ref_val |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:752:13:752:19 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:752:23:752:27 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:753:9:753:15 | let_ref |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:753:9:753:15 | let_ref | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:753:19:753:25 | ref_val |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:753:19:753:25 | ref_val | &T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:756:13:756:19 | mut_val |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:756:23:756:27 | 10i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:757:9:757:15 | let_mut |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:757:19:757:25 | mut_val |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:22:763:35 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:763:30:763:30 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:33:763:33 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:59:767:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:763:59:767:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:763:59:767:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:764:13:764:19 | param_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:764:23:764:23 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:765:13:765:19 | param_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:765:23:765:23 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:9:766:26 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:766:9:766:26 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:9:766:26 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:10:766:16 | param_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:766:19:766:25 | param_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:769:22:769:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:769:28:769:28 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:31:769:31 | _ |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:34:769:34 | _ |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:769:51:772:5 | { ... } |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:770:13:770:19 | param_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:770:23:770:23 | r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:771:9:771:15 | param_r |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:774:22:774:38 | TuplePat |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:774:22:774:38 | TuplePat | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:774:23:774:27 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:30:774:30 | _ |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:774:33:774:37 | third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:774:74:778:5 | { ... } |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:774:74:778:5 | { ... } | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:774:74:778:5 | { ... } | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:775:13:775:23 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:775:27:775:31 | first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:776:13:776:23 | param_third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:776:27:776:31 | third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:777:9:777:34 | TupleExpr |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:777:9:777:34 | TupleExpr | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:777:9:777:34 | TupleExpr | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:777:10:777:20 | param_first |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:777:23:777:33 | param_third |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:781:9:781:13 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:781:17:781:37 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:781:28:781:28 | 5 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:781:34:781:35 | 10 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:9:782:17 | extracted |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:782:9:782:17 | extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:9:782:17 | extracted | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:21:782:40 | extract_point(...) | 1(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:782:35:782:39 | point |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:784:9:784:13 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:784:17:784:35 | Color(...) |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:784:23:784:25 | 200 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:784:23:784:25 | 200 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:784:28:784:30 | 100 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:784:28:784:30 | 100 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:784:33:784:34 | 50 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:784:33:784:34 | 50 |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:785:9:785:11 | red |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:785:15:785:34 | extract_color(...) |  | {EXTERNAL LOCATION} | u8 |
+| pattern_matching.rs:785:29:785:33 | color |  | pattern_matching.rs:142:1:143:25 | Color |
+| pattern_matching.rs:787:9:787:13 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:787:9:787:13 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:9:787:13 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:9:787:13 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:787:17:787:38 | TupleExpr |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:17:787:38 | TupleExpr | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:787:18:787:22 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:787:25:787:31 | 3.14f64 |  | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:787:34:787:37 | true |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:9:788:23 | tuple_extracted | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) |  | file://:0:0:0:0 | (T_2) |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | 0(2) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:27:788:46 | extract_tuple(...) | 1(2) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:788:41:788:45 | tuple |  | file://:0:0:0:0 | (T_3) |
+| pattern_matching.rs:788:41:788:45 | tuple | 0(3) | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:788:41:788:45 | tuple | 1(3) | {EXTERNAL LOCATION} | f64 |
+| pattern_matching.rs:788:41:788:45 | tuple | 2(3) | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:794:23:794:42 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:23:794:42 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:34:794:34 | 1 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:40:794:40 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:45:794:64 | (...) |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:45:794:64 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:794:56:794:56 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:794:62:794:62 | 4 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:795:9:795:22 | Point {...} |  | pattern_matching.rs:135:1:140:1 | Point |
+| pattern_matching.rs:795:17:795:17 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:795:20:795:20 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:796:13:796:18 | loop_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:796:22:796:22 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:797:13:797:18 | loop_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:797:22:797:22 | y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:798:18:798:42 | "Point in loop: ({}, {})\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:798:18:798:58 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:798:18:798:58 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:798:45:798:50 | loop_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:798:53:798:58 | loop_y |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:9:802:20 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:802:9:802:20 | option_value | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:24:802:44 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:802:24:802:44 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:802:39:802:43 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:12:803:33 | ...::Some(...) |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:803:12:803:33 | ...::Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:27:803:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:31:803:32 | 42 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:803:37:803:48 | option_value |  | pattern_matching.rs:152:1:156:1 | MyOption |
+| pattern_matching.rs:803:37:803:48 | option_value | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:804:13:804:20 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:804:24:804:24 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:805:18:805:44 | "If let with @ pattern: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:805:18:805:54 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:805:18:805:54 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:805:47:805:54 | if_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:13:809:17 | stack |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:809:13:809:17 | stack | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:809:13:809:17 | stack | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:31:809:46 | MacroExpr |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:809:31:809:46 | MacroExpr | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:809:31:809:46 | MacroExpr | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:36:809:39 | 1i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:42:809:42 | 2 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:809:45:809:45 | 3 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:15:810:21 | Some(...) |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:810:15:810:21 | Some(...) | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:20:810:20 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:25:810:29 | stack |  | {EXTERNAL LOCATION} | Vec |
+| pattern_matching.rs:810:25:810:29 | stack | A | {EXTERNAL LOCATION} | Global |
+| pattern_matching.rs:810:25:810:29 | stack | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:810:25:810:35 | stack.pop() |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:810:25:810:35 | stack.pop() | T | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:811:13:811:23 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:811:27:811:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:812:18:812:29 | "Popped: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:812:18:812:42 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:812:18:812:42 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:812:32:812:42 | while_let_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:816:9:816:13 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:816:17:816:21 | 42i32 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:817:11:817:15 | value |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:9:818:9 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:14:818:14 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:818:14:818:18 | ... > ... |  | {EXTERNAL LOCATION} | bool |
+| pattern_matching.rs:818:18:818:18 | 0 |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:819:17:819:23 | guard_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:819:27:819:27 | x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" |  | file://:0:0:0:0 | & |
+| pattern_matching.rs:820:22:820:35 | "Positive: {}\\n" | &T | {EXTERNAL LOCATION} | str |
+| pattern_matching.rs:820:22:820:44 | FormatArgsExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:820:22:820:44 | MacroExpr |  | {EXTERNAL LOCATION} | Arguments |
+| pattern_matching.rs:820:38:820:44 | guard_x |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:822:9:822:9 | _ |  | {EXTERNAL LOCATION} | i32 |
+| pattern_matching.rs:827:5:827:7 | f(...) |  | {EXTERNAL LOCATION} | Option |
+| pattern_matching.rs:827:5:827:7 | f(...) | T | file://:0:0:0:0 | () |
 testFailures
diff --git a/rust/ql/test/library-tests/variables/Cfg.expected b/rust/ql/test/library-tests/variables/Cfg.expected
index 00a614975be8..0097a12e398d 100644
--- a/rust/ql/test/library-tests/variables/Cfg.expected
+++ b/rust/ql/test/library-tests/variables/Cfg.expected
@@ -5,14 +5,14 @@ edges
 | main.rs:5:14:5:14 | s | main.rs:5:14:5:20 | ...: ... | match |
 | main.rs:5:14:5:20 | ...: ... | main.rs:7:5:7:22 | ExprStmt |  |
 | main.rs:6:1:8:1 | { ... } | main.rs:5:1:8:1 | exit fn print_str (normal) |  |
-| main.rs:7:5:7:21 | ...::_print | main.rs:7:14:7:17 | "{}\\n" |  |
+| main.rs:7:5:7:12 | ...::_print | main.rs:7:14:7:17 | "{}\\n" |  |
 | main.rs:7:5:7:21 | MacroExpr | main.rs:6:1:8:1 | { ... } |  |
 | main.rs:7:5:7:21 | println!... | main.rs:7:5:7:21 | MacroExpr |  |
 | main.rs:7:5:7:22 | ExprStmt | main.rs:7:14:7:20 | ExprStmt |  |
 | main.rs:7:14:7:17 | "{}\\n" | main.rs:7:20:7:20 | s |  |
 | main.rs:7:14:7:20 | ...::_print(...) | main.rs:7:14:7:20 | { ... } |  |
 | main.rs:7:14:7:20 | ...::format_args_nl!... | main.rs:7:14:7:20 | MacroExpr |  |
-| main.rs:7:14:7:20 | ExprStmt | main.rs:7:5:7:21 | ...::_print |  |
+| main.rs:7:14:7:20 | ExprStmt | main.rs:7:5:7:12 | ...::_print |  |
 | main.rs:7:14:7:20 | FormatArgsExpr | main.rs:7:14:7:20 | ...::format_args_nl!... |  |
 | main.rs:7:14:7:20 | MacroBlockExpr | main.rs:7:5:7:21 | println!... |  |
 | main.rs:7:14:7:20 | MacroExpr | main.rs:7:14:7:20 | ...::_print(...) |  |
@@ -24,14 +24,14 @@ edges
 | main.rs:10:14:10:14 | i | main.rs:10:14:10:19 | ...: i64 | match |
 | main.rs:10:14:10:19 | ...: i64 | main.rs:12:5:12:22 | ExprStmt |  |
 | main.rs:11:1:13:1 | { ... } | main.rs:10:1:13:1 | exit fn print_i64 (normal) |  |
-| main.rs:12:5:12:21 | ...::_print | main.rs:12:14:12:17 | "{}\\n" |  |
+| main.rs:12:5:12:12 | ...::_print | main.rs:12:14:12:17 | "{}\\n" |  |
 | main.rs:12:5:12:21 | MacroExpr | main.rs:11:1:13:1 | { ... } |  |
 | main.rs:12:5:12:21 | println!... | main.rs:12:5:12:21 | MacroExpr |  |
 | main.rs:12:5:12:22 | ExprStmt | main.rs:12:14:12:20 | ExprStmt |  |
 | main.rs:12:14:12:17 | "{}\\n" | main.rs:12:20:12:20 | i |  |
 | main.rs:12:14:12:20 | ...::_print(...) | main.rs:12:14:12:20 | { ... } |  |
 | main.rs:12:14:12:20 | ...::format_args_nl!... | main.rs:12:14:12:20 | MacroExpr |  |
-| main.rs:12:14:12:20 | ExprStmt | main.rs:12:5:12:21 | ...::_print |  |
+| main.rs:12:14:12:20 | ExprStmt | main.rs:12:5:12:12 | ...::_print |  |
 | main.rs:12:14:12:20 | FormatArgsExpr | main.rs:12:14:12:20 | ...::format_args_nl!... |  |
 | main.rs:12:14:12:20 | MacroBlockExpr | main.rs:12:5:12:21 | println!... |  |
 | main.rs:12:14:12:20 | MacroExpr | main.rs:12:14:12:20 | ...::_print(...) |  |
@@ -250,14 +250,14 @@ edges
 | main.rs:102:13:102:13 | x | main.rs:104:9:104:30 | ExprStmt | match |
 | main.rs:103:13:103:13 | x | main.rs:102:13:102:13 | x |  |
 | main.rs:104:9:104:17 | print_str | main.rs:104:19:104:19 | x |  |
-| main.rs:104:9:104:29 | print_str(...) | main.rs:105:9:105:15 | ...::panic |  |
+| main.rs:104:9:104:29 | print_str(...) | main.rs:105:9:105:13 | ...::panic |  |
 | main.rs:104:9:104:30 | ExprStmt | main.rs:104:9:104:17 | print_str |  |
 | main.rs:104:19:104:19 | x | main.rs:104:19:104:28 | x.unwrap() |  |
 | main.rs:104:19:104:28 | x.unwrap() | main.rs:104:9:104:29 | print_str(...) |  |
-| main.rs:105:9:105:15 | "not yet implemented" | main.rs:105:9:105:15 | ...::panic(...) |  |
-| main.rs:105:9:105:15 | ...::panic | main.rs:105:9:105:15 | "not yet implemented" |  |
-| main.rs:105:9:105:15 | ...::panic(...) | main.rs:105:9:105:15 | MacroBlockExpr |  |
-| main.rs:105:9:105:15 | MacroBlockExpr | main.rs:105:9:105:15 | todo!... |  |
+| main.rs:105:9:105:13 | "not yet implemented" | main.rs:105:9:105:13 | ...::panic(...) |  |
+| main.rs:105:9:105:13 | ...::panic | main.rs:105:9:105:13 | "not yet implemented" |  |
+| main.rs:105:9:105:13 | ...::panic(...) | main.rs:105:9:105:13 | MacroBlockExpr |  |
+| main.rs:105:9:105:13 | MacroBlockExpr | main.rs:105:9:105:15 | todo!... |  |
 | main.rs:105:9:105:15 | MacroExpr | main.rs:101:10:106:5 | { ... } |  |
 | main.rs:105:9:105:15 | todo!... | main.rs:105:9:105:15 | MacroExpr |  |
 | main.rs:107:5:107:13 | print_str | main.rs:107:15:107:15 | x |  |
@@ -435,13 +435,13 @@ edges
 | main.rs:189:35:189:36 | 12 | main.rs:190:22:190:51 | ExprStmt | match |
 | main.rs:189:35:189:36 | 12 | main.rs:192:9:192:29 | ...::Hello {...} | no-match |
 | main.rs:189:43:191:9 | { ... } | main.rs:184:5:197:5 | match msg { ... } |  |
-| main.rs:190:13:190:52 | ...::_print | main.rs:190:22:190:51 | "Found an id in another range\\... |  |
+| main.rs:190:13:190:20 | ...::_print | main.rs:190:22:190:51 | "Found an id in another range\\... |  |
 | main.rs:190:13:190:52 | MacroExpr | main.rs:189:43:191:9 | { ... } |  |
 | main.rs:190:13:190:52 | println!... | main.rs:190:13:190:52 | MacroExpr |  |
 | main.rs:190:22:190:51 | "Found an id in another range\\... | main.rs:190:22:190:51 | FormatArgsExpr |  |
 | main.rs:190:22:190:51 | ...::_print(...) | main.rs:190:22:190:51 | { ... } |  |
 | main.rs:190:22:190:51 | ...::format_args_nl!... | main.rs:190:22:190:51 | MacroExpr |  |
-| main.rs:190:22:190:51 | ExprStmt | main.rs:190:13:190:52 | ...::_print |  |
+| main.rs:190:22:190:51 | ExprStmt | main.rs:190:13:190:20 | ...::_print |  |
 | main.rs:190:22:190:51 | FormatArgsExpr | main.rs:190:22:190:51 | ...::format_args_nl!... |  |
 | main.rs:190:22:190:51 | MacroBlockExpr | main.rs:190:13:190:52 | println!... |  |
 | main.rs:190:22:190:51 | MacroExpr | main.rs:190:22:190:51 | ...::_print(...) |  |
@@ -1662,12 +1662,12 @@ edges
 | main.rs:704:5:705:26 | let ... = ... | main.rs:705:23:705:24 | let ... = 37 |  |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:704:9:704:22 | var_from_macro |  |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:706:5:706:30 | ExprStmt | match |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |  |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro | match |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:23:705:24 | { ... } |  |
 | main.rs:705:9:705:25 | MacroExpr | main.rs:704:9:704:22 | var_from_macro |  |
 | main.rs:705:9:705:25 | let_in_macro!... | main.rs:705:9:705:25 | MacroExpr |  |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |  |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro | match |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:23:705:24 | { ... } |  |
-| main.rs:705:23:705:24 | 37 | main.rs:705:9:705:25 | var_in_macro |  |
+| main.rs:705:23:705:24 | 37 | main.rs:705:9:705:21 | var_in_macro |  |
 | main.rs:705:23:705:24 | let ... = 37 | main.rs:705:23:705:24 | 37 |  |
 | main.rs:705:23:705:24 | { ... } | main.rs:705:9:705:25 | let_in_macro!... |  |
 | main.rs:706:5:706:13 | print_i64 | main.rs:706:15:706:28 | var_from_macro |  |
@@ -1678,15 +1678,15 @@ edges
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:9:707:20 | var_in_macro |  |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:712:5:712:44 | ExprStmt | match |
 | main.rs:707:24:707:25 | 33 | main.rs:707:9:707:20 | var_in_macro |  |
-| main.rs:712:5:712:13 | print_i64 | main.rs:712:15:712:42 | let ... = 0 |  |
+| main.rs:712:5:712:13 | print_i64 | main.rs:712:15:712:28 | let ... = 0 |  |
 | main.rs:712:5:712:43 | print_i64(...) | main.rs:713:5:713:28 | ExprStmt |  |
 | main.rs:712:5:712:44 | ExprStmt | main.rs:712:5:712:13 | print_i64 |  |
-| main.rs:712:15:712:42 | 0 | main.rs:712:15:712:42 | var_in_macro |  |
+| main.rs:712:15:712:28 | 0 | main.rs:712:15:712:28 | var_in_macro |  |
+| main.rs:712:15:712:28 | let ... = 0 | main.rs:712:15:712:28 | 0 |  |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | var_in_macro |  |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:30:712:41 | var_in_macro | match |
 | main.rs:712:15:712:42 | MacroExpr | main.rs:712:5:712:43 | print_i64(...) |  |
-| main.rs:712:15:712:42 | let ... = 0 | main.rs:712:15:712:42 | 0 |  |
 | main.rs:712:15:712:42 | let_in_macro2!... | main.rs:712:15:712:42 | MacroExpr |  |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | var_in_macro |  |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:30:712:41 | var_in_macro | match |
 | main.rs:712:30:712:41 | var_in_macro | main.rs:712:30:712:41 | { ... } |  |
 | main.rs:712:30:712:41 | { ... } | main.rs:712:15:712:42 | let_in_macro2!... |  |
 | main.rs:713:5:713:13 | print_i64 | main.rs:713:15:713:26 | var_in_macro |  |
diff --git a/rust/ql/test/library-tests/variables/Ssa.expected b/rust/ql/test/library-tests/variables/Ssa.expected
index e0867ac71a27..da0a2b272e8b 100644
--- a/rust/ql/test/library-tests/variables/Ssa.expected
+++ b/rust/ql/test/library-tests/variables/Ssa.expected
@@ -179,9 +179,9 @@ definition
 | main.rs:682:13:682:13 | a | main.rs:682:13:682:13 | a |
 | main.rs:683:5:683:5 | a | main.rs:682:13:682:13 | a |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:704:9:704:22 | var_from_macro |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:9:707:20 | var_in_macro |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | var_in_macro |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | var_in_macro |
 | main.rs:718:5:718:5 | x | main.rs:717:9:717:9 | x |
 | main.rs:723:13:723:13 | x | main.rs:723:13:723:13 | x |
 | main.rs:724:13:724:15 | cap | main.rs:724:13:724:15 | cap |
@@ -384,9 +384,9 @@ read
 | main.rs:682:13:682:13 | a | main.rs:682:13:682:13 | a | main.rs:683:5:683:5 | a |
 | main.rs:683:5:683:5 | a | main.rs:682:13:682:13 | a | main.rs:686:15:686:15 | a |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:704:9:704:22 | var_from_macro | main.rs:706:15:706:28 | var_from_macro |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:9:707:20 | var_in_macro | main.rs:713:15:713:26 | var_in_macro |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | var_in_macro | main.rs:712:30:712:41 | var_in_macro |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | var_in_macro | main.rs:712:30:712:41 | var_in_macro |
 | main.rs:718:5:718:5 | x | main.rs:717:9:717:9 | x | main.rs:719:15:719:15 | x |
 | main.rs:724:13:724:15 | cap | main.rs:724:13:724:15 | cap | main.rs:730:5:730:7 | cap |
 | main.rs:724:20:724:20 | b | main.rs:724:20:724:20 | b | main.rs:726:20:726:20 | b |
@@ -544,9 +544,9 @@ firstRead
 | main.rs:682:13:682:13 | a | main.rs:682:13:682:13 | a | main.rs:683:5:683:5 | a |
 | main.rs:683:5:683:5 | a | main.rs:682:13:682:13 | a | main.rs:686:15:686:15 | a |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:704:9:704:22 | var_from_macro | main.rs:706:15:706:28 | var_from_macro |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:9:707:20 | var_in_macro | main.rs:713:15:713:26 | var_in_macro |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | var_in_macro | main.rs:712:30:712:41 | var_in_macro |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | var_in_macro | main.rs:712:30:712:41 | var_in_macro |
 | main.rs:718:5:718:5 | x | main.rs:717:9:717:9 | x | main.rs:719:15:719:15 | x |
 | main.rs:724:13:724:15 | cap | main.rs:724:13:724:15 | cap | main.rs:730:5:730:7 | cap |
 | main.rs:724:20:724:20 | b | main.rs:724:20:724:20 | b | main.rs:726:20:726:20 | b |
@@ -743,9 +743,9 @@ assigns
 | main.rs:667:9:667:9 | z | main.rs:667:13:667:14 | 17 |
 | main.rs:682:13:682:13 | a | main.rs:682:17:682:35 | MyStruct {...} |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:705:9:705:25 | MacroExpr |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:23:705:24 | 37 |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:23:705:24 | 37 |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:24:707:25 | 33 |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | 0 |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | 0 |
 | main.rs:718:5:718:5 | x | main.rs:718:9:718:9 | 1 |
 | main.rs:723:13:723:13 | x | main.rs:723:17:723:19 | 100 |
 | main.rs:724:13:724:15 | cap | main.rs:724:19:729:5 | \|...\| ... |
diff --git a/rust/ql/test/library-tests/variables/variables.expected b/rust/ql/test/library-tests/variables/variables.expected
index d34635b6da31..2a8673172d21 100644
--- a/rust/ql/test/library-tests/variables/variables.expected
+++ b/rust/ql/test/library-tests/variables/variables.expected
@@ -130,9 +130,9 @@ variable
 | main.rs:676:17:676:20 | self |
 | main.rs:682:13:682:13 | a |
 | main.rs:704:9:704:22 | var_from_macro |
-| main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro |
 | main.rs:707:9:707:20 | var_in_macro |
-| main.rs:712:15:712:42 | var_in_macro |
+| main.rs:712:15:712:28 | var_in_macro |
 | main.rs:717:9:717:9 | x |
 | main.rs:723:13:723:13 | x |
 | main.rs:724:13:724:15 | cap |
@@ -341,9 +341,9 @@ variableAccess
 | main.rs:677:10:677:13 | self | main.rs:676:17:676:20 | self |
 | main.rs:683:5:683:5 | a | main.rs:682:13:682:13 | a |
 | main.rs:686:15:686:15 | a | main.rs:682:13:682:13 | a |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |
 | main.rs:706:15:706:28 | var_from_macro | main.rs:704:9:704:22 | var_from_macro |
-| main.rs:712:30:712:41 | var_in_macro | main.rs:712:15:712:42 | var_in_macro |
+| main.rs:712:30:712:41 | var_in_macro | main.rs:712:15:712:28 | var_in_macro |
 | main.rs:713:15:713:26 | var_in_macro | main.rs:707:9:707:20 | var_in_macro |
 | main.rs:718:5:718:5 | x | main.rs:717:9:717:9 | x |
 | main.rs:719:15:719:15 | x | main.rs:717:9:717:9 | x |
@@ -547,9 +547,9 @@ variableReadAccess
 | main.rs:677:10:677:13 | self | main.rs:676:17:676:20 | self |
 | main.rs:683:5:683:5 | a | main.rs:682:13:682:13 | a |
 | main.rs:686:15:686:15 | a | main.rs:682:13:682:13 | a |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:9:705:25 | var_in_macro |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:9:705:21 | var_in_macro |
 | main.rs:706:15:706:28 | var_from_macro | main.rs:704:9:704:22 | var_from_macro |
-| main.rs:712:30:712:41 | var_in_macro | main.rs:712:15:712:42 | var_in_macro |
+| main.rs:712:30:712:41 | var_in_macro | main.rs:712:15:712:28 | var_in_macro |
 | main.rs:713:15:713:26 | var_in_macro | main.rs:707:9:707:20 | var_in_macro |
 | main.rs:719:15:719:15 | x | main.rs:717:9:717:9 | x |
 | main.rs:726:20:726:20 | b | main.rs:724:20:724:20 | b |
@@ -621,9 +621,9 @@ variableInitializer
 | main.rs:667:9:667:9 | z | main.rs:667:13:667:14 | 17 |
 | main.rs:682:13:682:13 | a | main.rs:682:17:682:35 | MyStruct {...} |
 | main.rs:704:9:704:22 | var_from_macro | main.rs:705:9:705:25 | MacroExpr |
-| main.rs:705:9:705:25 | var_in_macro | main.rs:705:23:705:24 | 37 |
+| main.rs:705:9:705:21 | var_in_macro | main.rs:705:23:705:24 | 37 |
 | main.rs:707:9:707:20 | var_in_macro | main.rs:707:24:707:25 | 33 |
-| main.rs:712:15:712:42 | var_in_macro | main.rs:712:15:712:42 | 0 |
+| main.rs:712:15:712:28 | var_in_macro | main.rs:712:15:712:28 | 0 |
 | main.rs:723:13:723:13 | x | main.rs:723:17:723:19 | 100 |
 | main.rs:724:13:724:15 | cap | main.rs:724:19:729:5 | \|...\| ... |
 capturedVariable
diff --git a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
index f1c469a407da..82c29ac7f2b0 100644
--- a/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
+++ b/rust/ql/test/query-tests/diagnostics/CONSISTENCY/ExtractionConsistency.expected
@@ -5,4 +5,4 @@ extractionWarning
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON |
 | error.rs:2:5:2:17 | An error! |
-| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' |
+| my_macro.rs:17:9:17:27 | macro expansion failed for 'myUndefinedMacro' |
diff --git a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
index 7f14093f20e5..22a2f381a9d1 100644
--- a/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
+++ b/rust/ql/test/query-tests/diagnostics/ExtractionWarnings.expected
@@ -4,4 +4,4 @@
 | does_not_compile.rs:2:21:2:20 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | does_not_compile.rs:2:26:2:25 | expected SEMICOLON | Extraction warning in does_not_compile.rs with message expected SEMICOLON | 1 |
 | error.rs:2:5:2:17 | An error! | Extraction warning in error.rs with message An error! | 1 |
-| my_macro.rs:17:9:17:27 | macro expansion failed: could not resolve macro 'myUndefinedMacro' | Extraction warning in my_macro.rs with message macro expansion failed: could not resolve macro 'myUndefinedMacro' | 1 |
+| my_macro.rs:17:9:17:27 | macro expansion failed for 'myUndefinedMacro' | Extraction warning in my_macro.rs with message macro expansion failed for 'myUndefinedMacro' | 1 |
diff --git a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
index 08e88a3039a8..26b5ede89092 100644
--- a/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-020/RegexInjection.expected
@@ -6,8 +6,8 @@ edges
 | main.rs:4:20:4:40 | ...::var(...) [Ok] | main.rs:4:20:4:66 | ... .unwrap_or(...) | provenance | MaD:2 |
 | 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:17:5:23 | res | main.rs:5:25:5:44 | { ... } | provenance |  |
+| main.rs:5:25:5:44 | ...::format(...) | main.rs:5:17:5:23 | 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:3 |
 | main.rs:5:25:5:44 | { ... } | main.rs:5:25:5:44 | ...::must_use(...) | provenance | MaD:4 |
@@ -23,7 +23,7 @@ nodes
 | 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:17:5:23 | 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 |
diff --git a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
index 29fb68236577..f6b8cfc2c4b4 100644
--- a/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
+++ b/rust/ql/test/query-tests/security/CWE-022/Cargo.lock
@@ -26,6 +26,119 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+dependencies = [
+ "async-lock",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix",
+ "slab",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@@ -50,7 +163,7 @@ dependencies = [
  "miniz_oxide",
  "object",
  "rustc-demangle",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -74,6 +187,25 @@ dependencies = [
  "generic-array",
 ]
 
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -92,6 +224,15 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
 [[package]]
 name = "cpufeatures"
 version = "0.2.17"
@@ -101,6 +242,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
 [[package]]
 name = "crypto-common"
 version = "0.1.6"
@@ -127,6 +274,49 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -157,6 +347,25 @@ version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
 
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "futures-macro"
 version = "0.3.31"
@@ -211,6 +420,18 @@ version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "h2"
 version = "0.4.10"
@@ -260,6 +481,12 @@ dependencies = [
  "http",
 ]
 
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
 [[package]]
 name = "http"
 version = "1.3.1"
@@ -357,12 +584,37 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
 [[package]]
 name = "libc"
 version = "0.2.173"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d8cfeafaffdbc32176b64fb251369d52ea9f0a8fbc6f8759edffef7b525d64bb"
 
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
 [[package]]
 name = "lock_api"
 version = "0.4.13"
@@ -373,6 +625,15 @@ dependencies = [
  "scopeguard",
 ]
 
+[[package]]
+name = "log"
+version = "0.4.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+dependencies = [
+ "value-bag",
+]
+
 [[package]]
 name = "memchr"
 version = "2.7.5"
@@ -432,6 +693,12 @@ version = "1.21.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
 [[package]]
 name = "parking_lot"
 version = "0.12.4"
@@ -452,7 +719,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -473,6 +740,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
 [[package]]
 name = "poem"
 version = "3.1.11"
@@ -518,6 +796,20 @@ dependencies = [
  "syn",
 ]
 
+[[package]]
+name = "polling"
+version = "3.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix",
+ "windows-sys 0.60.2",
+]
+
 [[package]]
 name = "proc-macro-crate"
 version = "3.3.0"
@@ -598,6 +890,25 @@ version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
 
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
 [[package]]
 name = "ryu"
 version = "1.0.20"
@@ -665,6 +976,15 @@ dependencies = [
  "digest",
 ]
 
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "slab"
 version = "0.4.10"
@@ -711,7 +1031,9 @@ dependencies = [
 name = "test"
 version = "0.0.1"
 dependencies = [
+ "async-std",
  "poem",
+ "tokio",
 ]
 
 [[package]]
@@ -744,7 +1066,9 @@ dependencies = [
  "bytes",
  "libc",
  "mio",
+ "parking_lot",
  "pin-project-lite",
+ "signal-hook-registry",
  "socket2",
  "tokio-macros",
  "windows-sys 0.52.0",
@@ -843,6 +1167,12 @@ version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
 [[package]]
 name = "version_check"
 version = "0.9.5"
@@ -855,19 +1185,106 @@ version = "0.11.1+wasi-snapshot-preview1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "wildmatch"
 version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "68ce1ab1f8c62655ebe1350f589c61e505cf94d385bc6a12899442d9081e71fd"
 
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -876,7 +1293,16 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
 ]
 
 [[package]]
@@ -885,14 +1311,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]
 
 [[package]]
@@ -901,48 +1344,96 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
 [[package]]
 name = "winnow"
 version = "0.7.11"
diff --git a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
index 60847b71b798..25f92e390de8 100644
--- a/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
+++ b/rust/ql/test/query-tests/security/CWE-022/TaintedPath.expected
@@ -1,20 +1,229 @@
 #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:11:5:11:22 | ...::read_to_string | src/main.rs:7:11:7:19 | file_name | src/main.rs:11:5:11:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:7:11:7:19 | file_name | user-provided value |
+| src/main.rs:58:5:58:22 | ...::read_to_string | src/main.rs:50:51:50:59 | file_path | src/main.rs:58:5:58:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:50:51:50:59 | file_path | user-provided value |
+| src/main.rs:71:5:71:22 | ...::read_to_string | src/main.rs:63:11:63:19 | file_path | src/main.rs:71:5:71:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:63:11:63:19 | file_path | user-provided value |
+| src/main.rs:99:5:99:22 | ...::read_to_string | src/main.rs:90:11:90:19 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | This path depends on a $@. | src/main.rs:90:11:90:19 | file_path | user-provided value |
+| src/main.rs:104:13:104:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:104:13:104:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:107:13:107:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:107:13:107:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:110:13:110:33 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:110:13:110:33 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:113:13:113:37 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:113:13:113:37 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:116:13:116:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:116:13:116:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:119:13:119:31 | ...::open | src/main.rs:103:17:103:30 | ...::args | src/main.rs:119:13:119:31 | ...::open | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:122:13:122:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:122:13:122:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:123:13:123:25 | ...::copy | src/main.rs:103:17:103:30 | ...::args | src/main.rs:123:13:123:25 | ...::copy | This path depends on a $@. | src/main.rs:103:17:103:30 | ...::args | user-provided value |
+| src/main.rs:173:13:173:18 | exists | src/main.rs:185:17:185:30 | ...::args | src/main.rs:173:13:173:18 | exists | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
+| src/main.rs:174:25:174:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:174:25:174:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | user-provided value |
+| src/main.rs:177:25:177:34 | ...::open | src/main.rs:185:17:185:30 | ...::args | src/main.rs:177:25:177:34 | ...::open | This path depends on a $@. | src/main.rs:185:17:185:30 | ...::args | 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:2 |
-| src/main.rs:8:35:8:43 | file_name | src/main.rs:8:21:8:44 | ...::from(...) | provenance | MaD:2 |
-| 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:7:11:7:19 | file_name | src/main.rs:9:35:9:43 | file_name | provenance |  |
+| src/main.rs:9:9:9:17 | file_path | src/main.rs:11:24:11:32 | file_path | provenance |  |
+| src/main.rs:9:21:9:44 | ...::from(...) | src/main.rs:9:9:9:17 | file_path | provenance |  |
+| src/main.rs:9:35:9:43 | file_name | src/main.rs:9:21:9:44 | ...::from(...) | provenance | MaD:13 |
+| src/main.rs:11:24:11:32 | file_path | src/main.rs:11:5:11:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:50:51:50:59 | file_path | src/main.rs:52:32:52:40 | file_path | provenance |  |
+| src/main.rs:52:9:52:17 | file_path [&ref] | src/main.rs:53:21:53:44 | file_path.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:52:21:52:41 | ...::new(...) [&ref] | src/main.rs:52:9:52:17 | file_path [&ref] | provenance |  |
+| src/main.rs:52:31:52:40 | &file_path [&ref] | src/main.rs:52:21:52:41 | ...::new(...) [&ref] | provenance | MaD:12 |
+| src/main.rs:52:32:52:40 | file_path | src/main.rs:52:31:52:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:53:9:53:17 | file_path | src/main.rs:58:24:58:32 | file_path | provenance |  |
+| src/main.rs:53:21:53:44 | file_path.canonicalize() [Ok] | src/main.rs:53:21:53:53 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:53:21:53:53 | ... .unwrap() | src/main.rs:53:9:53:17 | file_path | provenance |  |
+| src/main.rs:58:24:58:32 | file_path | src/main.rs:58:5:58:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:63:11:63:19 | file_path | src/main.rs:66:32:66:40 | file_path | provenance |  |
+| src/main.rs:66:9:66:17 | file_path [&ref] | src/main.rs:71:24:71:32 | file_path [&ref] | provenance |  |
+| src/main.rs:66:21:66:41 | ...::new(...) [&ref] | src/main.rs:66:9:66:17 | file_path [&ref] | provenance |  |
+| src/main.rs:66:31:66:40 | &file_path [&ref] | src/main.rs:66:21:66:41 | ...::new(...) [&ref] | provenance | MaD:12 |
+| src/main.rs:66:32:66:40 | file_path | src/main.rs:66:31:66:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:71:24:71:32 | file_path [&ref] | src/main.rs:71:5:71:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:90:11:90:19 | file_path | src/main.rs:93:32:93:40 | file_path | provenance |  |
+| src/main.rs:93:9:93:17 | file_path [&ref] | src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:93:21:93:41 | ...::new(...) [&ref] | src/main.rs:93:9:93:17 | file_path [&ref] | provenance |  |
+| src/main.rs:93:31:93:40 | &file_path [&ref] | src/main.rs:93:21:93:41 | ...::new(...) [&ref] | provenance | MaD:12 |
+| src/main.rs:93:32:93:40 | file_path | src/main.rs:93:31:93:40 | &file_path [&ref] | provenance |  |
+| src/main.rs:98:9:98:17 | file_path | src/main.rs:99:24:99:32 | file_path | provenance |  |
+| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | src/main.rs:98:21:98:53 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:98:21:98:53 | ... .unwrap() | src/main.rs:98:9:98:17 | file_path | provenance |  |
+| src/main.rs:99:24:99:32 | file_path | src/main.rs:99:5:99:22 | ...::read_to_string | provenance | MaD:6 Sink:MaD:6 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:104:33:104:37 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:106:39:106:43 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:109:41:109:45 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:112:45:112:49 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:115:39:115:43 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:122:27:122:31 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:123:37:123:41 | path1 | provenance |  |
+| src/main.rs:103:9:103:13 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:103:17:103:30 | ...::args | src/main.rs:103:17:103:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| src/main.rs:103:17:103:32 | ...::args(...) [element] | src/main.rs:103:17:103:39 | ... .nth(...) [Some] | provenance | MaD:9 |
+| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | src/main.rs:103:17:103:48 | ... .unwrap() | provenance | MaD:10 |
+| src/main.rs:103:17:103:48 | ... .unwrap() | src/main.rs:103:9:103:13 | path1 | provenance |  |
+| src/main.rs:104:33:104:37 | path1 | src/main.rs:104:33:104:45 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:104:33:104:45 | path1.clone() | src/main.rs:104:13:104:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:106:9:106:13 | path2 | src/main.rs:107:33:107:37 | path2 | provenance |  |
+| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | src/main.rs:106:17:106:61 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:106:17:106:61 | ... .unwrap() | src/main.rs:106:9:106:13 | path2 | provenance |  |
+| src/main.rs:106:39:106:43 | path1 | src/main.rs:106:39:106:51 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:106:39:106:51 | path1.clone() | src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | provenance | Config |
+| src/main.rs:107:33:107:37 | path2 | src/main.rs:107:13:107:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:109:9:109:13 | path3 | src/main.rs:110:35:110:39 | path3 | provenance |  |
+| src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | src/main.rs:109:17:109:60 | await ... [Ok] | provenance |  |
+| src/main.rs:109:17:109:60 | await ... [Ok] | src/main.rs:109:17:109:69 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:109:17:109:69 | ... .unwrap() | src/main.rs:109:9:109:13 | path3 | provenance |  |
+| src/main.rs:109:41:109:45 | path1 | src/main.rs:109:41:109:53 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:109:41:109:53 | path1.clone() | src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | provenance | Config |
+| src/main.rs:110:35:110:39 | path3 | src/main.rs:110:13:110:33 | ...::open | provenance | MaD:4 Sink:MaD:4 |
+| src/main.rs:112:9:112:13 | path4 | src/main.rs:113:39:113:43 | path4 | provenance |  |
+| src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | src/main.rs:112:17:112:64 | await ... [Ok] | provenance |  |
+| src/main.rs:112:17:112:64 | await ... [Ok] | src/main.rs:112:17:112:73 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:112:17:112:73 | ... .unwrap() | src/main.rs:112:9:112:13 | path4 | provenance |  |
+| src/main.rs:112:45:112:49 | path1 | src/main.rs:112:45:112:57 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:112:45:112:57 | path1.clone() | src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | provenance | Config |
+| src/main.rs:113:39:113:43 | path4 | src/main.rs:113:13:113:37 | ...::open | provenance | MaD:1 Sink:MaD:1 |
+| src/main.rs:115:9:115:13 | path5 [&ref] | src/main.rs:116:33:116:37 | path5 [&ref] | provenance |  |
+| src/main.rs:115:17:115:44 | ...::new(...) [&ref] | src/main.rs:115:9:115:13 | path5 [&ref] | provenance |  |
+| src/main.rs:115:38:115:43 | &path1 [&ref] | src/main.rs:115:17:115:44 | ...::new(...) [&ref] | provenance | MaD:12 |
+| src/main.rs:115:39:115:43 | path1 | src/main.rs:115:38:115:43 | &path1 [&ref] | provenance |  |
+| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:116:13:116:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:116:33:116:37 | path5 [&ref] | src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | provenance | Config |
+| src/main.rs:118:9:118:13 | path6 | src/main.rs:119:33:119:37 | path6 | provenance |  |
+| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | src/main.rs:118:17:118:45 | ... .unwrap() | provenance | MaD:11 |
+| src/main.rs:118:17:118:45 | ... .unwrap() | src/main.rs:118:9:118:13 | path6 | provenance |  |
+| src/main.rs:119:33:119:37 | path6 | src/main.rs:119:13:119:31 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:122:27:122:31 | path1 | src/main.rs:122:27:122:39 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:122:27:122:39 | path1.clone() | src/main.rs:122:13:122:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
+| src/main.rs:123:37:123:41 | path1 | src/main.rs:123:37:123:49 | path1.clone() | provenance | MaD:8 |
+| src/main.rs:123:37:123:49 | path1.clone() | src/main.rs:123:13:123:25 | ...::copy | provenance | MaD:5 Sink:MaD:5 |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:172:26:172:33 | path_str [&ref] | provenance |  |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | src/main.rs:174:36:174:43 | path_str [&ref] | provenance |  |
+| src/main.rs:172:9:172:12 | path [&ref] | src/main.rs:173:8:173:11 | path [&ref] | provenance |  |
+| src/main.rs:172:16:172:34 | ...::new(...) [&ref] | src/main.rs:172:9:172:12 | path [&ref] | provenance |  |
+| src/main.rs:172:26:172:33 | path_str [&ref] | src/main.rs:172:16:172:34 | ...::new(...) [&ref] | provenance | MaD:12 |
+| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:173:13:173:18 | exists | provenance | MaD:3 Sink:MaD:3 |
+| src/main.rs:173:8:173:11 | path [&ref] | src/main.rs:177:36:177:39 | path [&ref] | provenance |  |
+| src/main.rs:174:36:174:43 | path_str [&ref] | src/main.rs:174:25:174:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:177:36:177:39 | path [&ref] | src/main.rs:177:25:177:34 | ...::open | provenance | MaD:2 Sink:MaD:2 |
+| src/main.rs:185:9:185:13 | path1 | src/main.rs:186:18:186:22 | path1 | provenance |  |
+| src/main.rs:185:17:185:30 | ...::args | src/main.rs:185:17:185:32 | ...::args(...) [element] | provenance | Src:MaD:7  |
+| src/main.rs:185:17:185:32 | ...::args(...) [element] | src/main.rs:185:17:185:39 | ... .nth(...) [Some] | provenance | MaD:9 |
+| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | src/main.rs:185:17:185:48 | ... .unwrap() | provenance | MaD:10 |
+| src/main.rs:185:17:185:48 | ... .unwrap() | src/main.rs:185:9:185:13 | path1 | provenance |  |
+| src/main.rs:186:17:186:22 | &path1 [&ref] | src/main.rs:170:16:170:29 | ...: ... [&ref] | provenance |  |
+| src/main.rs:186:18:186:22 | path1 | src/main.rs:186:17:186:22 | &path1 [&ref] | provenance |  |
 models
-| 1 | Sink: std::fs::read_to_string; Argument[0]; path-injection |
-| 2 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue; taint |
+| 1 | Sink: <async_std::fs::file::File>::open; Argument[0]; path-injection |
+| 2 | Sink: <std::fs::File>::open; Argument[0]; path-injection |
+| 3 | Sink: <std::path::Path>::exists; Argument[self]; path-injection |
+| 4 | Sink: <tokio::fs::file::File>::open; Argument[0]; path-injection |
+| 5 | Sink: std::fs::copy; Argument[0,1]; path-injection |
+| 6 | Sink: std::fs::read_to_string; Argument[0]; path-injection |
+| 7 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 8 | Summary: <_ as core::clone::Clone>::clone; Argument[self].Reference; ReturnValue; value |
+| 9 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 10 | Summary: <core::option::Option>::unwrap; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 11 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 12 | Summary: <std::path::Path>::new; Argument[0].Reference; ReturnValue.Reference; value |
+| 13 | Summary: <std::path::PathBuf as core::convert::From>::from; Argument[0]; ReturnValue; value |
 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:7:11:7:19 | file_name | semmle.label | file_name |
+| src/main.rs:9:9:9:17 | file_path | semmle.label | file_path |
+| src/main.rs:9:21:9:44 | ...::from(...) | semmle.label | ...::from(...) |
+| src/main.rs:9:35:9:43 | file_name | semmle.label | file_name |
+| src/main.rs:11:5:11:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:11:24:11:32 | file_path | semmle.label | file_path |
+| src/main.rs:50:51:50:59 | file_path | semmle.label | file_path |
+| src/main.rs:52:9:52:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:52:21:52:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:52:31:52:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:52:32:52:40 | 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:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
+| src/main.rs:53:21:53:53 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:58:5:58:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:58:24:58:32 | file_path | semmle.label | file_path |
+| src/main.rs:63:11:63:19 | file_path | semmle.label | file_path |
+| src/main.rs:66:9:66:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:66:21:66:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:66:31:66:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:66:32:66:40 | file_path | semmle.label | file_path |
+| src/main.rs:71:5:71:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:71:24:71:32 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:90:11:90:19 | file_path | semmle.label | file_path |
+| src/main.rs:93:9:93:17 | file_path [&ref] | semmle.label | file_path [&ref] |
+| src/main.rs:93:21:93:41 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:93:31:93:40 | &file_path [&ref] | semmle.label | &file_path [&ref] |
+| src/main.rs:93:32:93:40 | file_path | semmle.label | file_path |
+| src/main.rs:98:9:98:17 | file_path | semmle.label | file_path |
+| src/main.rs:98:21:98:44 | file_path.canonicalize() [Ok] | semmle.label | file_path.canonicalize() [Ok] |
+| src/main.rs:98:21:98:53 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:99:5:99:22 | ...::read_to_string | semmle.label | ...::read_to_string |
+| src/main.rs:99:24:99:32 | file_path | semmle.label | file_path |
+| src/main.rs:103:9:103:13 | path1 | semmle.label | path1 |
+| src/main.rs:103:17:103:30 | ...::args | semmle.label | ...::args |
+| src/main.rs:103:17:103:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| src/main.rs:103:17:103:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| src/main.rs:103:17:103:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:104:13:104:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:104:33:104:37 | path1 | semmle.label | path1 |
+| src/main.rs:104:33:104:45 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:106:9:106:13 | path2 | semmle.label | path2 |
+| src/main.rs:106:17:106:52 | ...::canonicalize(...) [Ok] | semmle.label | ...::canonicalize(...) [Ok] |
+| src/main.rs:106:17:106:61 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:106:39:106:43 | path1 | semmle.label | path1 |
+| src/main.rs:106:39:106:51 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:107:13:107:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:107:33:107:37 | path2 | semmle.label | path2 |
+| src/main.rs:109:9:109:13 | path3 | semmle.label | path3 |
+| src/main.rs:109:17:109:54 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
+| src/main.rs:109:17:109:60 | await ... [Ok] | semmle.label | await ... [Ok] |
+| src/main.rs:109:17:109:69 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:109:41:109:45 | path1 | semmle.label | path1 |
+| src/main.rs:109:41:109:53 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:110:13:110:33 | ...::open | semmle.label | ...::open |
+| src/main.rs:110:35:110:39 | path3 | semmle.label | path3 |
+| src/main.rs:112:9:112:13 | path4 | semmle.label | path4 |
+| src/main.rs:112:17:112:58 | ...::canonicalize(...) [future, Ok] | semmle.label | ...::canonicalize(...) [future, Ok] |
+| src/main.rs:112:17:112:64 | await ... [Ok] | semmle.label | await ... [Ok] |
+| src/main.rs:112:17:112:73 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:112:45:112:49 | path1 | semmle.label | path1 |
+| src/main.rs:112:45:112:57 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:113:13:113:37 | ...::open | semmle.label | ...::open |
+| src/main.rs:113:39:113:43 | path4 | semmle.label | path4 |
+| src/main.rs:115:9:115:13 | path5 [&ref] | semmle.label | path5 [&ref] |
+| src/main.rs:115:17:115:44 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:115:38:115:43 | &path1 [&ref] | semmle.label | &path1 [&ref] |
+| src/main.rs:115:39:115:43 | path1 | semmle.label | path1 |
+| src/main.rs:116:13:116:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:116:33:116:37 | path5 [&ref] | semmle.label | path5 [&ref] |
+| src/main.rs:118:9:118:13 | path6 | semmle.label | path6 |
+| src/main.rs:118:17:118:36 | path5.canonicalize() [Ok] | semmle.label | path5.canonicalize() [Ok] |
+| src/main.rs:118:17:118:45 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:119:13:119:31 | ...::open | semmle.label | ...::open |
+| src/main.rs:119:33:119:37 | path6 | semmle.label | path6 |
+| src/main.rs:122:13:122:25 | ...::copy | semmle.label | ...::copy |
+| src/main.rs:122:27:122:31 | path1 | semmle.label | path1 |
+| src/main.rs:122:27:122:39 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:123:13:123:25 | ...::copy | semmle.label | ...::copy |
+| src/main.rs:123:37:123:41 | path1 | semmle.label | path1 |
+| src/main.rs:123:37:123:49 | path1.clone() | semmle.label | path1.clone() |
+| src/main.rs:170:16:170:29 | ...: ... [&ref] | semmle.label | ...: ... [&ref] |
+| src/main.rs:172:9:172:12 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:172:16:172:34 | ...::new(...) [&ref] | semmle.label | ...::new(...) [&ref] |
+| src/main.rs:172:26:172:33 | path_str [&ref] | semmle.label | path_str [&ref] |
+| src/main.rs:173:8:173:11 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:173:13:173:18 | exists | semmle.label | exists |
+| src/main.rs:174:25:174:34 | ...::open | semmle.label | ...::open |
+| src/main.rs:174:36:174:43 | path_str [&ref] | semmle.label | path_str [&ref] |
+| src/main.rs:177:25:177:34 | ...::open | semmle.label | ...::open |
+| src/main.rs:177:36:177:39 | path [&ref] | semmle.label | path [&ref] |
+| src/main.rs:185:9:185:13 | path1 | semmle.label | path1 |
+| src/main.rs:185:17:185:30 | ...::args | semmle.label | ...::args |
+| src/main.rs:185:17:185:32 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| src/main.rs:185:17:185:39 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| src/main.rs:185:17:185:48 | ... .unwrap() | semmle.label | ... .unwrap() |
+| src/main.rs:186:17:186:22 | &path1 [&ref] | semmle.label | &path1 [&ref] |
+| src/main.rs:186:18:186:22 | path1 | semmle.label | path1 |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-022/options.yml b/rust/ql/test/query-tests/security/CWE-022/options.yml
index e0b9bbfb5cf1..18392052c7c5 100644
--- a/rust/ql/test/query-tests/security/CWE-022/options.yml
+++ b/rust/ql/test/query-tests/security/CWE-022/options.yml
@@ -1,3 +1,5 @@
 qltest_use_nightly: true
 qltest_dependencies:
     - poem = { version = "3.1.7" }
+    - tokio = { version = "1.43.0", features = ["full"] }
+    - async-std = { version = "1.13.1" }
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
index 6f8c73654c5e..7acf036bb6bf 100644
--- a/rust/ql/test/query-tests/security/CWE-022/src/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-022/src/main.rs
@@ -1,6 +1,7 @@
 #![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
@@ -46,7 +47,7 @@ fn tainted_path_handler_folder_almost_good1(
 }
 
 //#[handler]
-fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) -> Result<String> {
+fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) -> Result<String> { // $ Source=remote6
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
     let file_path = file_path.canonicalize().unwrap();
@@ -54,12 +55,12 @@ fn tainted_path_handler_folder_good_simpler(Query(file_path): Query<String>) ->
     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 MISSING: path-injection-checked
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink MISSING: path-injection-checked SPURIOUS: Alert[rust/path-injection]=remote6
 }
 
 //#[handler]
 fn tainted_path_handler_folder_almost_good1_simpler(
-    Query(file_path): Query<String>, // $ MISSING: Source=remote3
+    Query(file_path): Query<String>, // $ Source=remote3
 ) -> Result<String> {
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
@@ -67,7 +68,7 @@ fn tainted_path_handler_folder_almost_good1_simpler(
     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-checked path-injection-sink MISSING: Alert[rust/path-injection]=remote3
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-checked path-injection-sink Alert[rust/path-injection]=remote3
 }
 
 //#[handler]
@@ -86,7 +87,7 @@ fn tainted_path_handler_folder_almost_good2(
 
 //#[handler]
 fn tainted_path_handler_folder_almost_good3(
-    Query(file_path): Query<String>, // $ MISSING: Source=remote5
+    Query(file_path): Query<String>, // $ Source=remote5
 ) -> Result<String> {
     let public_path = "/var/www/public_html";
     let file_path = Path::new(&file_path);
@@ -95,7 +96,31 @@ fn tainted_path_handler_folder_almost_good3(
         return Err(Error::from_status(StatusCode::BAD_REQUEST));
     }
     let file_path = file_path.canonicalize().unwrap(); // $ path-injection-checked
-    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink MISSING: Alert[rust/path-injection]=remote5
+    fs::read_to_string(file_path).map_err(InternalServerError) // $ path-injection-sink Alert[rust/path-injection]=remote5
+}
+
+async fn more_simple_cases() {
+    let path1 = std::env::args().nth(1).unwrap(); // $ Source=arg1
+    let _ = std::fs::File::open(path1.clone()); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path2 = std::fs::canonicalize(path1.clone()).unwrap();
+    let _ = std::fs::File::open(path2); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path3 = tokio::fs::canonicalize(path1.clone()).await.unwrap();
+    let _ = tokio::fs::File::open(path3); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path4 = async_std::fs::canonicalize(path1.clone()).await.unwrap();
+    let _ = async_std::fs::File::open(path4); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path5 = std::path::Path::new(&path1);
+    let _ = std::fs::File::open(path5); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let path6 = path5.canonicalize().unwrap();
+    let _ = std::fs::File::open(path6); // $ path-injection-sink Alert[rust/path-injection]=arg1
+
+    let harmless = "";
+    let _ = std::fs::copy(path1.clone(), harmless); // $ path-injection-sink Alert[rust/path-injection]=arg1
+    let _ = std::fs::copy(harmless, path1.clone()); // $ path-injection-sink Alert[rust/path-injection]=arg1
 }
 
 fn sinks(path1: &Path, path2: &Path) {
@@ -116,12 +141,47 @@ fn sinks(path1: &Path, path2: &Path) {
     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
+    let _ = std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = std::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = std::fs::OpenOptions::new().open(path1); // $ path-injection-sink
+
+    let _ = tokio::fs::read(path1); // $ path-injection-sink
+    let _ = tokio::fs::read_to_string(path1); // $ path-injection-sink
+    let _ = tokio::fs::remove_file(path1); // $ path-injection-sink
+    let _ = tokio::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = tokio::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = tokio::fs::OpenOptions::new().open(path1); // $ path-injection-sink
+
+    let _ = async_std::fs::read(path1); // $ path-injection-sink
+    let _ = async_std::fs::read_to_string(path1); // $ path-injection-sink
+    let _ = async_std::fs::remove_file(path1); // $ path-injection-sink
+    let _ = async_std::fs::DirBuilder::new().create(path1); // $ path-injection-sink
+    let _ = async_std::fs::DirBuilder::new().recursive(true).create(path1); // $ path-injection-sink
+    let _ = async_std::fs::OpenOptions::new().open(path1); // $ path-injection-sink
+}
+
+use std::fs::File;
+
+fn my_function(path_str: &str) -> Result<(), std::io::Error> {
+    // somewhat realistic example
+    let path = Path::new(path_str);
+    if path.exists() { // $ path-injection-sink Alert[rust/path-injection]=arg2
+        let mut file1 = File::open(path_str)?; // $ path-injection-sink Alert[rust/path-injection]=arg2
+        // ...
+
+        let mut file2 = File::open(path)?; // $ path-injection-sink Alert[rust/path-injection]=arg2
+        // ...
+    }
+
+    Ok(())
 }
 
-fn main() {}
+fn main() {
+    let path1 = std::env::args().nth(1).unwrap(); // $ Source=arg2
+    my_function(&path1);
+}
diff --git a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 6a60922b6f0f..000000000000
--- a/rust/ql/test/query-tests/security/CWE-089/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,3 +0,0 @@
-nonUniqueCertainType
-| sqlx.rs:158:13:158:81 | { ... } | E |
-| sqlx.rs:160:17:160:86 | { ... } | E |
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 cc00a44d9fc4..2168ca56a444 100644
--- a/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
+++ b/rust/ql/test/query-tests/security/CWE-089/SqlInjection.expected
@@ -23,8 +23,8 @@ edges
 | sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:9 |
 | sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:5 |
 | sqlx.rs:52:9:52:20 | safe_query_3 | sqlx.rs:77:25:77:45 | safe_query_3.as_str() | provenance | MaD:9 |
-| 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:24:52:30 | res | sqlx.rs:52:32:52:87 | { ... } | provenance |  |
+| sqlx.rs:52:32:52:87 | ...::format(...) | sqlx.rs:52:24:52:30 | 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:12 |
 | sqlx.rs:52:32:52:87 | { ... } | sqlx.rs:52:32:52:87 | ...::must_use(...) | provenance | MaD:13 |
@@ -75,7 +75,7 @@ nodes
 | 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 |
-| sqlx.rs:52:24:52:88 | res | semmle.label | res |
+| sqlx.rs:52:24:52:30 | res | semmle.label | res |
 | sqlx.rs:52:32:52:87 | ...::format(...) | semmle.label | ...::format(...) |
 | sqlx.rs:52:32:52:87 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | sqlx.rs:52:32:52:87 | MacroExpr | semmle.label | MacroExpr |
diff --git a/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected
new file mode 100644
index 000000000000..c25043e0ef65
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/CONSISTENCY/PathResolutionConsistency.expected
@@ -0,0 +1,2 @@
+multipleCallTargets
+| main.rs:9:43:9:63 | ...::from(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-117/Cargo.lock b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
new file mode 100644
index 000000000000..a4c67f043d02
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/Cargo.lock
@@ -0,0 +1,1646 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+# This file contains locks that were generated by the Rust test runner
+# It should be committed to the repository
+version = 4
+
+[[package]]
+name = "addr2line"
+version = "0.24.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "backtrace"
+version = "0.3.75"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
+dependencies = [
+ "addr2line",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "bitflags"
+version = "2.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2352e5597e9c544d5e6d9c95190d5d27738ade584fa8db0a16e130e5c2b5296e"
+dependencies = [
+ "shlex",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "encoding_rs"
+version = "0.8.35"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "env_logger"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580"
+dependencies = [
+ "humantime",
+ "is-terminal",
+ "log",
+ "regex",
+ "termcolor",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "r-efi",
+ "wasi 0.14.2+wasi-0.2.4",
+]
+
+[[package]]
+name = "gimli"
+version = "0.31.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
+
+[[package]]
+name = "h2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http",
+ "indexmap",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.15.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http",
+ "http-body",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "humantime"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b112acc8b3adf4b107a8ec20977da0273a8c386765a3ec0229bd500a1443f9f"
+
+[[package]]
+name = "hyper"
+version = "1.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http",
+ "hyper",
+ "hyper-util",
+ "rustls",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-tls"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+dependencies = [
+ "bytes",
+ "http-body-util",
+ "hyper",
+ "hyper-util",
+ "native-tls",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc2fdfdbff08affe55bb779f33b053aa1fe5dd5b54c257343c17edfa55711bdb"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http",
+ "http-body",
+ "hyper",
+ "libc",
+ "pin-project-lite",
+ "socket2",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+
+[[package]]
+name = "icu_properties"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "potential_utf",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+
+[[package]]
+name = "icu_provider"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "idna"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+dependencies = [
+ "equivalent",
+ "hashbrown",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "is-terminal"
+version = "0.4.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
+dependencies = [
+ "hermit-abi",
+ "libc",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "js-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.175"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litemap"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+
+[[package]]
+name = "log"
+version = "0.4.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+
+[[package]]
+name = "memchr"
+version = "2.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+]
+
+[[package]]
+name = "mio"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "native-tls"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87de3442987e9dbec73158d5c715e7ad9072fda936bb03d19d7fa10e00520f0e"
+dependencies = [
+ "libc",
+ "log",
+ "openssl",
+ "openssl-probe",
+ "openssl-sys",
+ "schannel",
+ "security-framework",
+ "security-framework-sys",
+ "tempfile",
+]
+
+[[package]]
+name = "object"
+version = "0.36.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "openssl"
+version = "0.10.73"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+dependencies = [
+ "bitflags",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+dependencies = [
+ "cc",
+ "libc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "potential_utf"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.97"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d61789d7719defeb74ea5fe81f2fdfdbd28a803847077cecce2ff14e1472f6f1"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "regex"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+
+[[package]]
+name = "reqwest"
+version = "0.12.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a77c62af46e79de0a562e1a9849205ffcb7fc1238876e9bd743357570e04046f"
+dependencies = [
+ "base64",
+ "bytes",
+ "encoding_rs",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-rustls",
+ "hyper-tls",
+ "hyper-util",
+ "ipnet",
+ "js-sys",
+ "log",
+ "mime",
+ "native-tls",
+ "once_cell",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper",
+ "system-configuration",
+ "tokio",
+ "tokio-native-tls",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+ "windows-registry",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
+
+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7160e3e10bf4535308537f3c4e1641468cd0e485175d6163087c0393c7d46643"
+dependencies = [
+ "once_cell",
+ "rustls-pki-types",
+ "rustls-webpki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+dependencies = [
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
+dependencies = [
+ "ring",
+ "rustls-pki-types",
+ "untrusted",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "schannel"
+version = "0.1.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f29ebaa345f945cec9fbbc532eb307f0fdad8161f281b6369539c8d84876b3d"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49db231d56a190491cb4aeda9527f1ad45345af50b0851622a7adb8c03b01c32"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "serde"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.219"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.142"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "030fedb782600dcbd6f02d479bf0d817ac3bb40d644745b769d6a96bc3afc5a7"
+dependencies = [
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "syn"
+version = "2.0.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7bc3fcb250e53458e712715cf74285c1f889686520d79294a9ef3bd7aa1fc619"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "system-configuration"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c879d448e9d986b661742763247d3693ed13609438cf3d006f51f5368a5ba6b"
+dependencies = [
+ "bitflags",
+ "core-foundation",
+ "system-configuration-sys",
+]
+
+[[package]]
+name = "system-configuration-sys"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "tempfile"
+version = "3.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8a64e3985349f2441a1a9ef0b853f869006c3855f2cda6862a94d26ebb9d6a1"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.3",
+ "once_cell",
+ "rustix",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "test"
+version = "0.0.1"
+dependencies = [
+ "env_logger",
+ "log",
+ "reqwest",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tokio"
+version = "1.45.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75ef51a33ef1da925cea3e4eb122833cb377c61439ca401b770f54902b806779"
+dependencies = [
+ "backtrace",
+ "bytes",
+ "libc",
+ "mio",
+ "pin-project-lite",
+ "socket2",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "tokio-native-tls"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2"
+dependencies = [
+ "native-tls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+dependencies = [
+ "rustls",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "66a539a9ad6d5d281510d5bd368c973d636c02dbf8a67300bfb6b950696ad7df"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+dependencies = [
+ "form_urlencoded",
+ "idna",
+ "percent-encoding",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasi"
+version = "0.14.2+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+dependencies = [
+ "wit-bindgen-rt",
+]
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+]
+
+[[package]]
+name = "wasm-bindgen-backend"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
+dependencies = [
+ "bumpalo",
+ "log",
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.50"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "wasm-bindgen-backend",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.77"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
+dependencies = [
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+
+[[package]]
+name = "windows-registry"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e400001bb720a623c1c69032f8e3e4cf09984deec740f007dd2b03ec864804b0"
+dependencies = [
+ "windows-result",
+ "windows-strings",
+ "windows-targets 0.52.6",
+]
+
+[[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.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.3",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
+
+[[package]]
+name = "wit-bindgen-rt"
+version = "0.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+dependencies = [
+ "bitflags",
+]
+
+[[package]]
+name = "writeable"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+
+[[package]]
+name = "yoke"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
new file mode 100644
index 000000000000..adc258a886aa
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.expected
@@ -0,0 +1,111 @@
+#select
+| main.rs:16:5:16:9 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:16:5:16:9 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
+| main.rs:17:5:17:10 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:17:5:17:10 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
+| main.rs:19:5:19:10 | ...::log | main.rs:10:22:10:34 | ...::var | main.rs:19:5:19:10 | ...::log | Log entry depends on a $@. | main.rs:10:22:10:34 | ...::var | user-provided value |
+| main.rs:30:5:30:9 | ...::log | main.rs:11:23:11:44 | ...::get | main.rs:30:5:30:9 | ...::log | Log entry depends on a $@. | main.rs:11:23:11:44 | ...::get | user-provided value |
+| main.rs:108:9:108:13 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:108:9:108:13 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:109:9:109:13 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:109:9:109:13 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:110:9:110:14 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:110:9:110:14 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:111:9:111:14 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:111:9:111:14 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:112:9:112:14 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:112:9:112:14 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:115:9:115:13 | ...::log | main.rs:105:25:105:38 | ...::args | main.rs:115:9:115:13 | ...::log | Log entry depends on a $@. | main.rs:105:25:105:38 | ...::args | user-provided value |
+| main.rs:122:9:122:16 | ...::_print | main.rs:119:25:119:37 | ...::var | main.rs:122:9:122:16 | ...::_print | Log entry depends on a $@. | main.rs:119:25:119:37 | ...::var | user-provided value |
+| main.rs:123:9:123:17 | ...::_eprint | main.rs:119:25:119:37 | ...::var | main.rs:123:9:123:17 | ...::_eprint | Log entry depends on a $@. | main.rs:119:25:119:37 | ...::var | user-provided value |
+edges
+| main.rs:10:9:10:18 | user_input | main.rs:16:11:16:44 | MacroExpr | provenance |  |
+| main.rs:10:9:10:18 | user_input | main.rs:19:12:19:39 | MacroExpr | provenance |  |
+| main.rs:10:22:10:34 | ...::var | main.rs:10:22:10:48 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:10:22:10:48 | ...::var(...) [Ok] | main.rs:10:22:10:81 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:10:22:10:81 | ... .unwrap_or(...) | main.rs:10:9:10:18 | user_input | provenance |  |
+| main.rs:11:9:11:19 | remote_data | main.rs:17:12:17:46 | MacroExpr | provenance |  |
+| main.rs:11:9:11:19 | remote_data | main.rs:30:11:30:66 | MacroExpr | provenance |  |
+| main.rs:11:23:11:44 | ...::get | main.rs:11:23:11:71 | ...::get(...) [Ok] | provenance | Src:MaD:4  |
+| main.rs:11:23:11:71 | ...::get(...) [Ok] | main.rs:11:23:12:17 | ... .unwrap() | provenance | MaD:9 |
+| main.rs:11:23:12:17 | ... .unwrap() | main.rs:11:23:12:24 | ... .text() [Ok] | provenance | MaD:12 |
+| main.rs:11:23:12:24 | ... .text() [Ok] | main.rs:11:23:12:61 | ... .unwrap_or(...) | provenance | MaD:10 |
+| main.rs:11:23:12:61 | ... .unwrap_or(...) | main.rs:11:9:11:19 | remote_data | provenance |  |
+| main.rs:16:11:16:44 | MacroExpr | main.rs:16:5:16:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:17:12:17:46 | MacroExpr | main.rs:17:5:17:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:19:12:19:39 | MacroExpr | main.rs:19:5:19:10 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:30:11:30:66 | MacroExpr | main.rs:30:5:30:9 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:105:13:105:21 | user_data | main.rs:108:15:108:35 | MacroExpr | provenance |  |
+| main.rs:105:13:105:21 | user_data | main.rs:109:15:109:38 | MacroExpr | provenance |  |
+| main.rs:105:13:105:21 | user_data | main.rs:110:16:110:37 | MacroExpr | provenance |  |
+| main.rs:105:13:105:21 | user_data | main.rs:111:16:111:37 | MacroExpr | provenance |  |
+| main.rs:105:13:105:21 | user_data | main.rs:112:16:112:37 | MacroExpr | provenance |  |
+| main.rs:105:13:105:21 | user_data | main.rs:115:15:115:75 | MacroExpr | provenance |  |
+| main.rs:105:25:105:38 | ...::args | main.rs:105:25:105:40 | ...::args(...) [element] | provenance | Src:MaD:5  |
+| main.rs:105:25:105:40 | ...::args(...) [element] | main.rs:105:25:105:47 | ... .nth(...) [Some] | provenance | MaD:7 |
+| main.rs:105:25:105:47 | ... .nth(...) [Some] | main.rs:105:25:105:67 | ... .unwrap_or_default() | provenance | MaD:8 |
+| main.rs:105:25:105:67 | ... .unwrap_or_default() | main.rs:105:13:105:21 | user_data | provenance |  |
+| main.rs:108:15:108:35 | MacroExpr | main.rs:108:9:108:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:109:15:109:38 | MacroExpr | main.rs:109:9:109:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:110:16:110:37 | MacroExpr | main.rs:110:9:110:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:111:16:111:37 | MacroExpr | main.rs:111:9:111:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:112:16:112:37 | MacroExpr | main.rs:112:9:112:14 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:115:15:115:75 | MacroExpr | main.rs:115:9:115:13 | ...::log | provenance | MaD:1 Sink:MaD:1 |
+| main.rs:119:13:119:21 | user_data | main.rs:122:18:122:38 | MacroExpr | provenance |  |
+| main.rs:119:13:119:21 | user_data | main.rs:123:19:123:49 | MacroExpr | provenance |  |
+| main.rs:119:25:119:37 | ...::var | main.rs:119:25:119:45 | ...::var(...) [Ok] | provenance | Src:MaD:6  |
+| main.rs:119:25:119:45 | ...::var(...) [Ok] | main.rs:119:25:119:65 | ... .unwrap_or_default() | provenance | MaD:11 |
+| main.rs:119:25:119:65 | ... .unwrap_or_default() | main.rs:119:13:119:21 | user_data | provenance |  |
+| main.rs:122:18:122:38 | MacroExpr | main.rs:122:9:122:16 | ...::_print | provenance | MaD:3 Sink:MaD:3 |
+| main.rs:123:19:123:49 | MacroExpr | main.rs:123:9:123:17 | ...::_eprint | provenance | MaD:2 Sink:MaD:2 |
+models
+| 1 | Sink: log::__private_api::log; Argument[0]; log-injection |
+| 2 | Sink: std::io::stdio::_eprint; Argument[0]; log-injection |
+| 3 | Sink: std::io::stdio::_print; Argument[0]; log-injection |
+| 4 | Source: reqwest::blocking::get; ReturnValue.Field[core::result::Result::Ok(0)]; remote |
+| 5 | Source: std::env::args; ReturnValue.Element; commandargs |
+| 6 | Source: std::env::var; ReturnValue.Field[core::result::Result::Ok(0)]; environment |
+| 7 | Summary: <_ as core::iter::traits::iterator::Iterator>::nth; Argument[self].Element; ReturnValue.Field[core::option::Option::Some(0)]; value |
+| 8 | Summary: <core::option::Option>::unwrap_or_default; Argument[self].Field[core::option::Option::Some(0)]; ReturnValue; value |
+| 9 | Summary: <core::result::Result>::unwrap; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 10 | Summary: <core::result::Result>::unwrap_or; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 11 | Summary: <core::result::Result>::unwrap_or_default; Argument[self].Field[core::result::Result::Ok(0)]; ReturnValue; value |
+| 12 | Summary: <reqwest::blocking::response::Response>::text; Argument[self]; ReturnValue.Field[core::result::Result::Ok(0)]; taint |
+nodes
+| main.rs:10:9:10:18 | user_input | semmle.label | user_input |
+| main.rs:10:22:10:34 | ...::var | semmle.label | ...::var |
+| main.rs:10:22:10:48 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:10:22:10:81 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:11:9:11:19 | remote_data | semmle.label | remote_data |
+| main.rs:11:23:11:44 | ...::get | semmle.label | ...::get |
+| main.rs:11:23:11:71 | ...::get(...) [Ok] | semmle.label | ...::get(...) [Ok] |
+| main.rs:11:23:12:17 | ... .unwrap() | semmle.label | ... .unwrap() |
+| main.rs:11:23:12:24 | ... .text() [Ok] | semmle.label | ... .text() [Ok] |
+| main.rs:11:23:12:61 | ... .unwrap_or(...) | semmle.label | ... .unwrap_or(...) |
+| main.rs:16:5:16:9 | ...::log | semmle.label | ...::log |
+| main.rs:16:11:16:44 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:17:5:17:10 | ...::log | semmle.label | ...::log |
+| main.rs:17:12:17:46 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:19:5:19:10 | ...::log | semmle.label | ...::log |
+| main.rs:19:12:19:39 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:30:5:30:9 | ...::log | semmle.label | ...::log |
+| main.rs:30:11:30:66 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:105:13:105:21 | user_data | semmle.label | user_data |
+| main.rs:105:25:105:38 | ...::args | semmle.label | ...::args |
+| main.rs:105:25:105:40 | ...::args(...) [element] | semmle.label | ...::args(...) [element] |
+| main.rs:105:25:105:47 | ... .nth(...) [Some] | semmle.label | ... .nth(...) [Some] |
+| main.rs:105:25:105:67 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
+| main.rs:108:9:108:13 | ...::log | semmle.label | ...::log |
+| main.rs:108:15:108:35 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:109:9:109:13 | ...::log | semmle.label | ...::log |
+| main.rs:109:15:109:38 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:110:9:110:14 | ...::log | semmle.label | ...::log |
+| main.rs:110:16:110:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:111:9:111:14 | ...::log | semmle.label | ...::log |
+| main.rs:111:16:111:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:112:9:112:14 | ...::log | semmle.label | ...::log |
+| main.rs:112:16:112:37 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:115:9:115:13 | ...::log | semmle.label | ...::log |
+| main.rs:115:15:115:75 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:119:13:119:21 | user_data | semmle.label | user_data |
+| main.rs:119:25:119:37 | ...::var | semmle.label | ...::var |
+| main.rs:119:25:119:45 | ...::var(...) [Ok] | semmle.label | ...::var(...) [Ok] |
+| main.rs:119:25:119:65 | ... .unwrap_or_default() | semmle.label | ... .unwrap_or_default() |
+| main.rs:122:9:122:16 | ...::_print | semmle.label | ...::_print |
+| main.rs:122:18:122:38 | MacroExpr | semmle.label | MacroExpr |
+| main.rs:123:9:123:17 | ...::_eprint | semmle.label | ...::_eprint |
+| main.rs:123:19:123:49 | MacroExpr | semmle.label | MacroExpr |
+subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref b/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref
new file mode 100644
index 000000000000..e71d62b14e68
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/LogInjection.qlref
@@ -0,0 +1,4 @@
+query: queries/security/CWE-117/LogInjection.ql
+postprocess:
+ - utils/test/PrettyPrintModels.ql
+ - utils/test/InlineExpectationsTestQuery.ql
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-117/main.rs b/rust/ql/test/query-tests/security/CWE-117/main.rs
new file mode 100644
index 000000000000..10bb03eb02ca
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/main.rs
@@ -0,0 +1,125 @@
+use std::env;
+use log::{info, warn, error, debug, trace};
+
+fn main() {
+    env_logger::init();
+
+    // Sources of user input
+    let args: Vec<String> = env::args().collect();
+    let username = args.get(1).unwrap_or(&String::from("Guest")).clone(); // $ MISSING: Source=commandargs
+    let user_input = std::env::var("USER_INPUT").unwrap_or("default".to_string()); // $ Source=environment
+    let remote_data = reqwest::blocking::get("http://example.com/user") // $ Source=remote
+        .unwrap().text().unwrap_or("remote_user".to_string());
+
+    // BAD: Direct logging of user input
+    info!("User login: {}", username); // $ MISSING: Alert[rust/log-injection]
+    warn!("Warning for user: {}", user_input); // $ Alert[rust/log-injection]=environment
+    error!("Error processing: {}", remote_data); // $ Alert[rust/log-injection]=remote
+    debug!("Debug info: {}", username); // $ MISSING: Alert[rust/log-injection]
+    trace!("Trace data: {}", user_input); // $ Alert[rust/log-injection]=environment
+
+    // BAD: Formatted strings with user input
+    let formatted_msg = format!("Processing user: {}", username);
+    info!("{}", formatted_msg); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: String concatenation with user input
+    let concat_msg = "User activity: ".to_string() + &username;
+    info!("{}", concat_msg); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Complex formatting
+    info!("User {} accessed resource at {}", username, remote_data); // $ Alert[rust/log-injection]=remote
+
+    // GOOD: Sanitized input
+    let sanitized_username = username.replace('\n', "").replace('\r', "");
+    info!("Sanitized user login: {}", sanitized_username);
+
+    // GOOD: Constant strings
+    info!("System startup complete");
+
+    // GOOD: Non-user-controlled data
+    let system_time = std::time::SystemTime::now();
+    info!("Current time: {:?}", system_time);
+
+    // GOOD: Numeric data derived from user input (not directly logged)
+    let user_id = username.len();
+    info!("User ID length: {}", user_id);
+
+    // More complex test cases
+    test_complex_scenarios(&username, &user_input);
+    test_indirect_flows(&remote_data);
+}
+
+fn test_complex_scenarios(username: &str, user_input: &str) {
+    // BAD: Indirect logging through variables
+    let log_message = format!("Activity for {}", username);
+    info!("{}", log_message); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Through function parameters
+    log_user_activity(username); // Function call - should be tracked
+
+    // BAD: Through struct fields
+    let user_info = UserInfo { name: username.to_string() };
+    info!("User info: {}", user_info.name); // $ MISSING: Alert[rust/log-injection]
+
+    // GOOD: After sanitization
+    let clean_input = sanitize_input(user_input);
+    info!("Clean input: {}", clean_input);
+}
+
+fn log_user_activity(user: &str) {
+    info!("User activity: {}", user); // $ MISSING: Alert[rust/log-injection]
+}
+
+fn sanitize_input(input: &str) -> String {
+    input.replace('\n', "").replace('\r', "").replace('\t', " ")
+}
+
+struct UserInfo {
+    name: String,
+}
+
+fn test_indirect_flows(data: &str) {
+    // BAD: Flow through intermediate variables
+    let temp_var = data;
+    let another_var = temp_var;
+    info!("Indirect flow: {}", another_var); // $ MISSING: Alert[rust/log-injection]
+
+    // BAD: Flow through collections
+    let data_vec = vec![data];
+    if let Some(item) = data_vec.first() {
+        info!("Vector item: {}", item); // $ MISSING: Alert[rust/log-injection]
+    }
+
+    // BAD: Flow through Option/Result
+    let optional_data = Some(data);
+    if let Some(unwrapped) = optional_data {
+        info!("Unwrapped data: {}", unwrapped); // $ MISSING: Alert[rust/log-injection]
+    }
+}
+
+// Additional test patterns for different logging scenarios
+mod additional_tests {
+    use log::*;
+
+    pub fn test_macro_variations() {
+        let user_data = std::env::args().nth(1).unwrap_or_default(); // $ Source=commandargs
+
+        // BAD: Different log macro variations
+        info!("Info: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        warn!("Warning: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        error!("Error: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        debug!("Debug: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+        trace!("Trace: {}", user_data); // $ Alert[rust/log-injection]=commandargs
+
+        // BAD: Complex format strings
+        info!("User {} did action {} at time {}", user_data, "login", "now"); // $ Alert[rust/log-injection]=commandargs
+    }
+
+    pub fn test_println_patterns() {
+        let user_data = std::env::var("USER").unwrap_or_default(); // $ Source=environment
+
+        // These might not be caught depending on model coverage, but are potential logging sinks
+        println!("User: {}", user_data); // $ Alert[rust/log-injection]=environment
+        eprintln!("Error for user: {}", user_data); // $ Alert[rust/log-injection]=environment
+    }
+}
diff --git a/rust/ql/test/query-tests/security/CWE-117/options.yml b/rust/ql/test/query-tests/security/CWE-117/options.yml
new file mode 100644
index 000000000000..fae9beded52c
--- /dev/null
+++ b/rust/ql/test/query-tests/security/CWE-117/options.yml
@@ -0,0 +1,5 @@
+qltest_cargo_check: true
+qltest_dependencies:
+    - log = "0.4"
+    - env_logger = "0.10"
+    - reqwest = { version = "0.12.9", features = ["blocking"] }
\ No newline at end of file
diff --git a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
index 0a229c72d757..dbeebc63e555 100644
--- a/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
+++ b/rust/ql/test/query-tests/security/CWE-311/CleartextTransmission.expected
@@ -6,16 +6,16 @@
 | main.rs:35:12:35:18 | request | main.rs:33:50:33:57 | password | main.rs:35:12:35:18 | request | This 'request' operation 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:15:6:21 | res | main.rs:6:23:6:57 | { ... } | provenance |  |
+| main.rs:6:23:6:57 | ...::format(...) | main.rs:6:15:6:21 | 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:7 |
 | main.rs:6:23:6:57 | { ... } | main.rs:6:23:6:57 | ...::must_use(...) | provenance | MaD:8 |
 | 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:19:12:25 | res | main.rs:12:27:12:59 | { ... } | provenance |  |
+| main.rs:12:27:12:59 | ...::format(...) | main.rs:12:19:12:25 | 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:7 |
 | main.rs:12:27:12:59 | { ... } | main.rs:12:27:12:59 | ...::must_use(...) | provenance | MaD:8 |
@@ -27,24 +27,24 @@ edges
 | 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:15:19:21 | res | main.rs:19:23:19:57 | { ... } | provenance |  |
+| main.rs:19:23:19:57 | ...::format(...) | main.rs:19:15:19:21 | 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:7 |
 | main.rs:19:23:19:57 | { ... } | main.rs:19:23:19:57 | ...::must_use(...) | provenance | MaD:8 |
 | 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:15:26:21 | res | main.rs:26:23:26:57 | { ... } | provenance |  |
+| main.rs:26:23:26:57 | ...::format(...) | main.rs:26:15:26:21 | 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:7 |
 | main.rs:26:23:26:57 | { ... } | main.rs:26:23:26:57 | ...::must_use(...) | provenance | MaD:8 |
 | 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:15:33:21 | res | main.rs:33:23:33:57 | { ... } | provenance |  |
+| main.rs:33:23:33:57 | ...::format(...) | main.rs:33:15:33:21 | 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:7 |
 | main.rs:33:23:33:57 | { ... } | main.rs:33:23:33:57 | ...::must_use(...) | provenance | MaD:8 |
@@ -61,7 +61,7 @@ models
 | 8 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
 | main.rs:6:9:6:11 | url | semmle.label | url |
-| main.rs:6:15:6:58 | res | semmle.label | res |
+| main.rs:6:15:6:21 | 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 |
@@ -70,7 +70,7 @@ nodes
 | 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:19:12:25 | 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 |
@@ -84,7 +84,7 @@ nodes
 | 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:15:19:21 | 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 |
@@ -93,7 +93,7 @@ nodes
 | 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:15:26:21 | 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 |
@@ -102,7 +102,7 @@ nodes
 | 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:15:33:21 | 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 |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
index e569aca9804c..ac6f2b2d997a 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,78 +1,77 @@
 multipleCallTargets
-| test_logging.rs:42:5:42:36 | ...::max_level(...) |
-| test_logging.rs:43:5:43:36 | ...::max_level(...) |
-| test_logging.rs:44:5:44:35 | ...::max_level(...) |
-| test_logging.rs:45:5:45:36 | ...::max_level(...) |
-| test_logging.rs:46:5:46:35 | ...::max_level(...) |
-| test_logging.rs:47:5:47:48 | ...::max_level(...) |
-| test_logging.rs:50:5:50:21 | ...::max_level(...) |
-| test_logging.rs:51:5:51:36 | ...::max_level(...) |
-| test_logging.rs:52:5:52:36 | ...::max_level(...) |
-| test_logging.rs:53:5:53:46 | ...::max_level(...) |
-| test_logging.rs:54:5:54:49 | ...::max_level(...) |
-| test_logging.rs:55:5:55:34 | ...::max_level(...) |
-| test_logging.rs:56:5:56:47 | ...::max_level(...) |
-| test_logging.rs:57:5:57:34 | ...::max_level(...) |
-| test_logging.rs:58:5:58:36 | ...::max_level(...) |
-| test_logging.rs:59:5:59:54 | ...::max_level(...) |
-| test_logging.rs:60:5:60:54 | ...::max_level(...) |
-| test_logging.rs:61:5:61:55 | ...::max_level(...) |
-| test_logging.rs:64:5:64:48 | ...::max_level(...) |
-| test_logging.rs:65:5:65:48 | ...::max_level(...) |
-| test_logging.rs:66:5:66:66 | ...::max_level(...) |
-| test_logging.rs:67:5:67:66 | ...::max_level(...) |
-| test_logging.rs:68:5:68:67 | ...::max_level(...) |
-| test_logging.rs:71:5:71:47 | ...::max_level(...) |
-| test_logging.rs:72:5:72:47 | ...::max_level(...) |
-| test_logging.rs:73:5:73:50 | ...::max_level(...) |
-| test_logging.rs:74:5:74:65 | ...::max_level(...) |
-| test_logging.rs:75:5:75:51 | ...::max_level(...) |
-| test_logging.rs:76:5:76:47 | ...::max_level(...) |
-| test_logging.rs:77:5:77:48 | ...::max_level(...) |
+| test_logging.rs:42:5:42:10 | ...::max_level(...) |
+| test_logging.rs:43:5:43:10 | ...::max_level(...) |
+| test_logging.rs:44:5:44:9 | ...::max_level(...) |
+| test_logging.rs:45:5:45:10 | ...::max_level(...) |
+| test_logging.rs:46:5:46:9 | ...::max_level(...) |
+| test_logging.rs:47:5:47:8 | ...::max_level(...) |
+| test_logging.rs:50:5:50:10 | ...::max_level(...) |
+| test_logging.rs:51:5:51:10 | ...::max_level(...) |
+| test_logging.rs:52:5:52:10 | ...::max_level(...) |
+| test_logging.rs:53:5:53:10 | ...::max_level(...) |
+| test_logging.rs:54:5:54:10 | ...::max_level(...) |
+| test_logging.rs:55:5:55:10 | ...::max_level(...) |
+| test_logging.rs:56:5:56:10 | ...::max_level(...) |
+| test_logging.rs:57:5:57:10 | ...::max_level(...) |
+| test_logging.rs:58:5:58:10 | ...::max_level(...) |
+| test_logging.rs:59:5:59:10 | ...::max_level(...) |
+| test_logging.rs:60:5:60:10 | ...::max_level(...) |
+| test_logging.rs:61:5:61:10 | ...::max_level(...) |
+| test_logging.rs:64:5:64:8 | ...::max_level(...) |
+| test_logging.rs:65:5:65:8 | ...::max_level(...) |
+| test_logging.rs:66:5:66:8 | ...::max_level(...) |
+| test_logging.rs:67:5:67:8 | ...::max_level(...) |
+| test_logging.rs:68:5:68:8 | ...::max_level(...) |
+| test_logging.rs:71:5:71:10 | ...::max_level(...) |
+| test_logging.rs:72:5:72:10 | ...::max_level(...) |
+| test_logging.rs:73:5:73:10 | ...::max_level(...) |
+| test_logging.rs:74:5:74:10 | ...::max_level(...) |
+| test_logging.rs:75:5:75:10 | ...::max_level(...) |
+| test_logging.rs:76:5:76:10 | ...::max_level(...) |
+| test_logging.rs:77:5:77:10 | ...::max_level(...) |
 | test_logging.rs:77:20:77:36 | password.as_str() |
-| test_logging.rs:78:5:78:50 | ...::max_level(...) |
+| test_logging.rs:78:5:78:10 | ...::max_level(...) |
 | test_logging.rs:78:22:78:38 | password.as_str() |
-| test_logging.rs:81:5:81:44 | ...::max_level(...) |
-| test_logging.rs:82:5:82:44 | ...::max_level(...) |
-| test_logging.rs:83:5:83:47 | ...::max_level(...) |
-| test_logging.rs:84:5:84:62 | ...::max_level(...) |
-| test_logging.rs:85:5:85:48 | ...::max_level(...) |
-| test_logging.rs:86:5:86:44 | ...::max_level(...) |
+| test_logging.rs:81:5:81:10 | ...::max_level(...) |
+| test_logging.rs:82:5:82:10 | ...::max_level(...) |
+| test_logging.rs:83:5:83:10 | ...::max_level(...) |
+| test_logging.rs:84:5:84:10 | ...::max_level(...) |
+| test_logging.rs:85:5:85:10 | ...::max_level(...) |
+| test_logging.rs:86:5:86:10 | ...::max_level(...) |
 | test_logging.rs:88:18:88:34 | password.as_str() |
-| test_logging.rs:89:5:89:29 | ...::max_level(...) |
-| test_logging.rs:90:5:90:31 | ...::max_level(...) |
-| test_logging.rs:94:5:94:29 | ...::max_level(...) |
-| test_logging.rs:97:5:97:19 | ...::max_level(...) |
-| test_logging.rs:100:5:100:19 | ...::max_level(...) |
-| test_logging.rs:104:5:104:19 | ...::max_level(...) |
-| test_logging.rs:108:5:108:19 | ...::max_level(...) |
-| test_logging.rs:112:5:112:50 | ...::max_level(...) |
-| test_logging.rs:114:9:114:55 | ...::max_level(...) |
-| test_logging.rs:118:5:118:42 | ...::max_level(...) |
-| test_logging.rs:121:5:121:33 | ...::max_level(...) |
-| test_logging.rs:123:5:123:33 | ...::max_level(...) |
-| test_logging.rs:126:5:126:33 | ...::max_level(...) |
-| test_logging.rs:130:5:130:32 | ...::max_level(...) |
-| test_logging.rs:131:5:131:32 | ...::max_level(...) |
-| test_logging.rs:132:5:132:32 | ...::max_level(...) |
-| test_logging.rs:133:5:133:33 | ...::max_level(...) |
-| test_logging.rs:140:5:140:38 | ...::max_level(...) |
-| test_logging.rs:141:5:141:38 | ...::max_level(...) |
-| test_logging.rs:142:5:142:29 | ...::max_level(...) |
-| test_logging.rs:143:5:143:31 | ...::max_level(...) |
-| test_logging.rs:144:5:144:32 | ...::max_level(...) |
-| test_logging.rs:150:5:150:38 | ...::max_level(...) |
-| test_logging.rs:151:5:151:38 | ...::max_level(...) |
-| test_logging.rs:152:5:152:29 | ...::max_level(...) |
-| test_logging.rs:153:5:153:31 | ...::max_level(...) |
-| test_logging.rs:154:5:154:32 | ...::max_level(...) |
+| test_logging.rs:89:5:89:10 | ...::max_level(...) |
+| test_logging.rs:90:5:90:10 | ...::max_level(...) |
+| test_logging.rs:94:5:94:9 | ...::max_level(...) |
+| test_logging.rs:97:5:97:9 | ...::max_level(...) |
+| test_logging.rs:100:5:100:9 | ...::max_level(...) |
+| test_logging.rs:104:5:104:9 | ...::max_level(...) |
+| test_logging.rs:108:5:108:9 | ...::max_level(...) |
+| test_logging.rs:112:5:112:9 | ...::max_level(...) |
+| test_logging.rs:114:9:114:13 | ...::max_level(...) |
+| test_logging.rs:118:5:118:10 | ...::max_level(...) |
+| test_logging.rs:121:5:121:10 | ...::max_level(...) |
+| test_logging.rs:123:5:123:10 | ...::max_level(...) |
+| test_logging.rs:126:5:126:10 | ...::max_level(...) |
+| test_logging.rs:130:5:130:10 | ...::max_level(...) |
+| test_logging.rs:131:5:131:10 | ...::max_level(...) |
+| test_logging.rs:132:5:132:10 | ...::max_level(...) |
+| test_logging.rs:133:5:133:10 | ...::max_level(...) |
+| test_logging.rs:140:5:140:9 | ...::max_level(...) |
+| test_logging.rs:141:5:141:9 | ...::max_level(...) |
+| test_logging.rs:142:5:142:9 | ...::max_level(...) |
+| test_logging.rs:143:5:143:9 | ...::max_level(...) |
+| test_logging.rs:144:5:144:9 | ...::max_level(...) |
+| test_logging.rs:150:5:150:9 | ...::max_level(...) |
+| test_logging.rs:151:5:151:9 | ...::max_level(...) |
+| test_logging.rs:152:5:152:9 | ...::max_level(...) |
+| test_logging.rs:153:5:153:9 | ...::max_level(...) |
+| test_logging.rs:154:5:154:9 | ...::max_level(...) |
 | test_logging.rs:192:12:192:37 | ...::_print(...) |
 | test_logging.rs:193:14:193:37 | ...::_print(...) |
 | test_logging.rs:194:13:194:38 | ...::_eprint(...) |
 | test_logging.rs:195:15:195:38 | ...::_eprint(...) |
 | test_logging.rs:229:30:229:71 | ... .as_str() |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() |
-| test_logging.rs:243:5:245:66 | ... .write_all(...) |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() |
diff --git a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected b/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected
deleted file mode 100644
index 952a4afe86b9..000000000000
--- a/rust/ql/test/query-tests/security/CWE-312/CONSISTENCY/TypeInferenceConsistency.expected
+++ /dev/null
@@ -1,4 +0,0 @@
-nonUniqueCertainType
-| test_logging.rs:17:8:19:12 | { ... } | E |
-| test_logging.rs:29:8:31:12 | { ... } | E |
-| test_storage.rs:177:8:179:9 | { ... } | E |
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 0cf81cf9d776..01d3b06a854e 100644
--- a/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
+++ b/rust/ql/test/query-tests/security/CWE-312/CleartextLogging.expected
@@ -1,53 +1,53 @@
 #select
-| test_logging.rs:42:5:42:36 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
-| test_logging.rs:43:5:43:36 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
-| test_logging.rs:44:5:44:35 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
-| test_logging.rs:45:5:45:36 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
-| test_logging.rs:46:5:46:35 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:35 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
-| test_logging.rs:47:5:47:48 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:48 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
-| test_logging.rs:52:5:52:36 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
-| test_logging.rs:54:5:54:49 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:49 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
-| test_logging.rs:56:5:56:47 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:47 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
-| test_logging.rs:57:5:57:34 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:34 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
-| test_logging.rs:58:5:58:36 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:36 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
-| test_logging.rs:60:5:60:54 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:54 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
-| test_logging.rs:61:5:61:55 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:55 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
-| 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: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 |
-| test_logging.rs:118:5:118:42 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:42 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
-| test_logging.rs:131:5:131:32 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:32 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
-| test_logging.rs:141:5:141:38 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
-| test_logging.rs:151:5:151:38 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:38 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
+| test_logging.rs:42:5:42:10 | ...::log | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:5:42:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:42:28:42:35 | password | password |
+| test_logging.rs:43:5:43:10 | ...::log | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:5:43:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:43:28:43:35 | password | password |
+| test_logging.rs:44:5:44:9 | ...::log | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:5:44:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:44:27:44:34 | password | password |
+| test_logging.rs:45:5:45:10 | ...::log | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:5:45:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:45:28:45:35 | password | password |
+| test_logging.rs:46:5:46:9 | ...::log | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:5:46:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:46:27:46:34 | password | password |
+| test_logging.rs:47:5:47:8 | ...::log | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:5:47:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:47:40:47:47 | password | password |
+| test_logging.rs:52:5:52:10 | ...::log | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:5:52:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:52:28:52:35 | password | password |
+| test_logging.rs:54:5:54:10 | ...::log | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:5:54:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:54:41:54:48 | password | password |
+| test_logging.rs:56:5:56:10 | ...::log | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:5:56:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:56:39:56:46 | password | password |
+| test_logging.rs:57:5:57:10 | ...::log | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:5:57:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:57:24:57:31 | password | password |
+| test_logging.rs:58:5:58:10 | ...::log | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:5:58:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:58:24:58:31 | password | password |
+| test_logging.rs:60:5:60:10 | ...::log | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:5:60:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:60:46:60:53 | password | password |
+| test_logging.rs:61:5:61:10 | ...::log | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:5:61:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:61:21:61:28 | password | password |
+| test_logging.rs:65:5:65:8 | ...::log | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:5:65:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:65:40:65:47 | password | password |
+| test_logging.rs:67:5:67:8 | ...::log | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:5:67:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:67:58:67:65 | password | password |
+| test_logging.rs:68:5:68:8 | ...::log | test_logging.rs:68:19:68:26 | password | test_logging.rs:68:5:68:8 | ...::log | This operation writes $@ to a log file. | test_logging.rs:68:19:68:26 | password | password |
+| test_logging.rs:72:5:72:10 | ...::log | test_logging.rs:72:39:72:46 | password | test_logging.rs:72:5:72:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:72:39:72:46 | password | password |
+| test_logging.rs:74:5:74:10 | ...::log | test_logging.rs:74:57:74:64 | password | test_logging.rs:74:5:74:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:74:57:74:64 | password | password |
+| test_logging.rs:75:5:75:10 | ...::log | test_logging.rs:75:21:75:28 | password | test_logging.rs:75:5:75:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:75:21:75:28 | password | password |
+| test_logging.rs:76:5:76:10 | ...::log | test_logging.rs:76:39:76:46 | password | test_logging.rs:76:5:76:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:76:39:76:46 | password | password |
+| test_logging.rs:82:5:82:10 | ...::log | test_logging.rs:82:36:82:43 | password | test_logging.rs:82:5:82:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:82:36:82:43 | password | password |
+| test_logging.rs:84:5:84:10 | ...::log | test_logging.rs:84:54:84:61 | password | test_logging.rs:84:5:84:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:84:54:84:61 | password | password |
+| test_logging.rs:85:5:85:10 | ...::log | test_logging.rs:85:21:85:28 | password | test_logging.rs:85:5:85:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:85:21:85:28 | password | password |
+| test_logging.rs:86:5:86:10 | ...::log | test_logging.rs:86:36:86:43 | password | test_logging.rs:86:5:86:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:86:36:86:43 | password | password |
+| test_logging.rs:94:5:94:9 | ...::log | test_logging.rs:93:15:93:22 | password | test_logging.rs:94:5:94:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:93:15:93:22 | password | password |
+| test_logging.rs:97:5:97:9 | ...::log | test_logging.rs:96:42:96:49 | password | test_logging.rs:97:5:97:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:96:42:96:49 | password | password |
+| test_logging.rs:100:5:100:9 | ...::log | test_logging.rs:99:38:99:45 | password | test_logging.rs:100:5:100:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:99:38:99:45 | password | password |
+| test_logging.rs:118:5:118:10 | ...::log | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:5:118:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:118:28:118:41 | get_password(...) | get_password(...) |
+| test_logging.rs:131:5:131:10 | ...::log | test_logging.rs:129:25:129:32 | password | test_logging.rs:131:5:131:10 | ...::log | This operation writes $@ to a log file. | test_logging.rs:129:25:129:32 | password | password |
+| test_logging.rs:141:5:141:9 | ...::log | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:5:141:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:141:27:141:37 | s1.password | s1.password |
+| test_logging.rs:151:5:151:9 | ...::log | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:5:151:9 | ...::log | This operation writes $@ to a log file. | test_logging.rs:151:27:151:37 | s2.password | s2.password |
 | test_logging.rs:176:22:176:31 | log_expect | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:22:176:31 | log_expect | This operation writes $@ to a log file. | test_logging.rs:176:70:176:78 | password2 | password2 |
 | test_logging.rs:180:24:180:33 | log_expect | test_logging.rs:180:72:180:80 | password2 | test_logging.rs:180:24:180:33 | log_expect | This operation writes $@ to a log file. | test_logging.rs:180:72:180:80 | password2 | password2 |
 | test_logging.rs:184:25:184:34 | log_expect | test_logging.rs:183:51:183:59 | password2 | test_logging.rs:184:25:184:34 | log_expect | This operation writes $@ to a log file. | test_logging.rs:183:51:183:59 | password2 | password2 |
 | test_logging.rs:188:25:188:34 | log_unwrap | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:188:25:188:34 | log_unwrap | This operation writes $@ to a log file. | test_logging.rs:187:51:187:59 | password2 | password2 |
-| test_logging.rs:192:5:192:38 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
-| test_logging.rs:193:5:193:38 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:38 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
-| test_logging.rs:194:5:194:39 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
-| test_logging.rs:195:5:195:39 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:39 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
-| test_logging.rs:199:13:199:44 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:44 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
-| test_logging.rs:202:13:202:43 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:43 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
-| test_logging.rs:205:13:205:52 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
-| test_logging.rs:208:13:208:50 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:50 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
-| test_logging.rs:211:13:211:52 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:52 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
-| test_logging.rs:214:13:214:54 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
-| test_logging.rs:217:13:217:54 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:54 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
-| test_logging.rs:220:13:220:58 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:58 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
-| test_logging.rs:223:13:223:60 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
-| test_logging.rs:226:13:226:60 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:60 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
+| test_logging.rs:192:5:192:10 | ...::_print | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:5:192:10 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:192:30:192:37 | password | password |
+| test_logging.rs:193:5:193:12 | ...::_print | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:5:193:12 | ...::_print | This operation writes $@ to a log file. | test_logging.rs:193:30:193:37 | password | password |
+| test_logging.rs:194:5:194:11 | ...::_eprint | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:5:194:11 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:194:31:194:38 | password | password |
+| test_logging.rs:195:5:195:13 | ...::_eprint | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:5:195:13 | ...::_eprint | This operation writes $@ to a log file. | test_logging.rs:195:31:195:38 | password | password |
+| test_logging.rs:199:13:199:18 | ...::panic_fmt | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:13:199:18 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:199:36:199:43 | password | password |
+| test_logging.rs:202:13:202:17 | ...::panic_fmt | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:13:202:17 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:202:35:202:42 | password | password |
+| test_logging.rs:205:13:205:26 | ...::panic_fmt | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:13:205:26 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:205:44:205:51 | password | password |
+| test_logging.rs:208:13:208:24 | ...::panic_fmt | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:13:208:24 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:208:42:208:49 | password | password |
+| test_logging.rs:211:13:211:19 | ...::panic_fmt | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:13:211:19 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:211:44:211:51 | password | password |
+| test_logging.rs:214:13:214:22 | ...::assert_failed | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:13:214:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:214:46:214:53 | password | password |
+| test_logging.rs:217:13:217:22 | ...::assert_failed | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:13:217:22 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:217:46:217:53 | password | password |
+| test_logging.rs:220:13:220:25 | ...::panic_fmt | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:13:220:25 | ...::panic_fmt | This operation writes $@ to a log file. | test_logging.rs:220:50:220:57 | password | password |
+| test_logging.rs:223:13:223:28 | ...::assert_failed | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:13:223:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:223:52:223:59 | password | password |
+| test_logging.rs:226:13:226:28 | ...::assert_failed | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:13:226:28 | ...::assert_failed | This operation writes $@ to a log file. | test_logging.rs:226:52:226:59 | password | password |
 | test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
 | test_logging.rs:229:23:229:28 | expect | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:23:229:28 | expect | This operation writes $@ to a log file. | test_logging.rs:229:54:229:61 | password | password |
 | test_logging.rs:242:10:242:14 | write | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:10:242:14 | write | This operation writes $@ to a log file. | test_logging.rs:242:42:242:49 | password | password |
@@ -55,126 +55,126 @@
 | test_logging.rs:248:9:248:13 | write | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:9:248:13 | write | This operation writes $@ to a log file. | test_logging.rs:248:41:248:48 | password | password |
 | test_logging.rs:251:9:251:13 | write | test_logging.rs:251:41:251:48 | password | test_logging.rs:251:9:251:13 | write | This operation writes $@ to a log file. | test_logging.rs:251:41:251:48 | password | password |
 edges
-| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:42:12:42:35 | MacroExpr | test_logging.rs:42:5:42:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:42:28:42:35 | password | test_logging.rs:42:12:42:35 | MacroExpr | provenance |  |
-| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:43:12:43:35 | MacroExpr | test_logging.rs:43:5:43:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:43:28:43:35 | password | test_logging.rs:43:12:43:35 | MacroExpr | provenance |  |
-| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:44:11:44:34 | MacroExpr | test_logging.rs:44:5:44:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:44:27:44:34 | password | test_logging.rs:44:11:44:34 | MacroExpr | provenance |  |
-| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:45:12:45:35 | MacroExpr | test_logging.rs:45:5:45:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:45:28:45:35 | password | test_logging.rs:45:12:45:35 | MacroExpr | provenance |  |
-| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:35 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:46:11:46:34 | MacroExpr | test_logging.rs:46:5:46:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:46:27:46:34 | password | test_logging.rs:46:11:46:34 | MacroExpr | provenance |  |
-| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:47:24:47:47 | MacroExpr | test_logging.rs:47:5:47:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:47:40:47:47 | password | test_logging.rs:47:24:47:47 | MacroExpr | provenance |  |
-| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:52:12:52:35 | MacroExpr | test_logging.rs:52:5:52:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:52:28:52:35 | password | test_logging.rs:52:12:52:35 | MacroExpr | provenance |  |
-| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:49 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:54:12:54:48 | MacroExpr | test_logging.rs:54:5:54:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:54:41:54:48 | password | test_logging.rs:54:12:54:48 | MacroExpr | provenance |  |
-| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:47 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:56:12:56:46 | MacroExpr | test_logging.rs:56:5:56:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:56:39:56:46 | password | test_logging.rs:56:12:56:46 | MacroExpr | provenance |  |
-| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:34 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:57:12:57:33 | MacroExpr | test_logging.rs:57:5:57:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:57:24:57:31 | password | test_logging.rs:57:12:57:33 | MacroExpr | provenance |  |
-| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:36 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:58:12:58:35 | MacroExpr | test_logging.rs:58:5:58:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:58:24:58:31 | password | test_logging.rs:58:12:58:35 | MacroExpr | provenance |  |
-| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:54 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:60:30:60:53 | MacroExpr | test_logging.rs:60:5:60:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:60:46:60:53 | password | test_logging.rs:60:30:60:53 | MacroExpr | provenance |  |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:55 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | test_logging.rs:61:5:61:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:61:20:61:28 | &password | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:61:20:61:28 | &password [&ref] | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | provenance |  |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | provenance |  |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password | provenance | Config |
 | test_logging.rs:61:21:61:28 | password | test_logging.rs:61:20:61:28 | &password [&ref] | provenance |  |
-| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:48 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:65:24:65:47 | MacroExpr | test_logging.rs:65:5:65:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:65:40:65:47 | password | test_logging.rs:65:24:65:47 | MacroExpr | provenance |  |
-| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:66 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:67:42:67:65 | MacroExpr | test_logging.rs:67:5:67:8 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:67:58:67:65 | password | test_logging.rs:67:42:67:65 | MacroExpr | provenance |  |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:67 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | test_logging.rs:68:5:68:8 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | test_logging.rs:68:18:68:26 | &password | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0] | provenance |  |
 | test_logging.rs:68:18:68:26 | &password [&ref] | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | provenance |  |
 | test_logging.rs:68:18:68:26 | TupleExpr [tuple.0, &ref] | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | provenance |  |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:72:23:72:46 | MacroExpr | test_logging.rs:72:5:72:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:74:41:74:64 | MacroExpr | test_logging.rs:74:5:74:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:51 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:75:20:75:28 | &... [&ref, tuple.0] | test_logging.rs:75:5:75:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:76:23:76:46 | MacroExpr | test_logging.rs:76:5:76:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:82:20:82:43 | MacroExpr | test_logging.rs:82:5:82:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:84:38:84:61 | MacroExpr | test_logging.rs:84:5:84:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
-| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:48 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0, &ref] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 Sink:MaD:13 |
+| test_logging.rs:85:20:85:28 | &... [&ref, tuple.0] | test_logging.rs:85:5:85:10 | ...::log | provenance | MaD:13 Sink:MaD:13 Sink:MaD:13 |
 | 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:12 Sink:MaD:12 |
+| test_logging.rs:86:20:86:43 | MacroExpr | test_logging.rs:86:5:86:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | 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 |  |
 | test_logging.rs:93:15:93:22 | password | test_logging.rs:93:14:93:22 | &password | provenance | Config |
-| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:29 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:94:11:94:28 | MacroExpr | test_logging.rs:94:5:94:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:96:9:96:10 | m2 | test_logging.rs:97:11:97:18 | MacroExpr | provenance |  |
 | test_logging.rs:96:41:96:49 | &password | test_logging.rs:96:9:96:10 | m2 | provenance |  |
 | test_logging.rs:96:42:96:49 | password | test_logging.rs:96:41:96:49 | &password | provenance | Config |
-| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:97:11:97:18 | MacroExpr | test_logging.rs:97:5:97:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:99:9:99:10 | m3 | test_logging.rs:100:11:100:18 | MacroExpr | provenance |  |
-| test_logging.rs:99:14:99:46 | res | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
-| test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:14:99:46 | res | provenance |  |
+| test_logging.rs:99:14:99:20 | res | test_logging.rs:99:22:99:45 | { ... } | provenance |  |
+| test_logging.rs:99:22:99:45 | ...::format(...) | test_logging.rs:99:14:99:20 | res | provenance |  |
 | test_logging.rs:99:22:99:45 | ...::must_use(...) | test_logging.rs:99:9:99:10 | m3 | provenance |  |
 | test_logging.rs:99:22:99:45 | MacroExpr | test_logging.rs:99:22:99:45 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:99:22:99:45 | { ... } | test_logging.rs:99:22:99:45 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:99:38:99:45 | password | test_logging.rs:99:22:99:45 | MacroExpr | provenance |  |
-| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:19 | ...::log | provenance | MaD:12 Sink:MaD:12 |
-| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:42 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:100:11:100:18 | MacroExpr | test_logging.rs:100:5:100:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:118:12:118:41 | MacroExpr | test_logging.rs:118:5:118:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:118:28:118:41 | get_password(...) | test_logging.rs:118:12:118:41 | MacroExpr | provenance |  |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | test_logging.rs:131:28:131:29 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | test_logging.rs:129:9:129:10 | t1 [tuple.1] | provenance |  |
 | test_logging.rs:129:25:129:32 | password | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | provenance |  |
-| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:32 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:131:12:131:31 | MacroExpr | test_logging.rs:131:5:131:10 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | test_logging.rs:131:28:131:31 | t1.1 | provenance |  |
 | test_logging.rs:131:28:131:31 | t1.1 | test_logging.rs:131:12:131:31 | MacroExpr | provenance |  |
-| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:141:11:141:37 | MacroExpr | test_logging.rs:141:5:141:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:141:27:141:37 | s1.password | test_logging.rs:141:11:141:37 | MacroExpr | provenance |  |
-| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:38 | ...::log | provenance | MaD:12 Sink:MaD:12 |
+| test_logging.rs:151:11:151:37 | MacroExpr | test_logging.rs:151:5:151:9 | ...::log | provenance | MaD:12 Sink:MaD:12 |
 | test_logging.rs:151:27:151:37 | s2.password | test_logging.rs:151:11:151:37 | MacroExpr | provenance |  |
 | test_logging.rs:176:33:176:79 | &... | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
 | test_logging.rs:176:33:176:79 | &... [&ref] | test_logging.rs:176:22:176:31 | log_expect | provenance | MaD:1 Sink:MaD:1 |
+| test_logging.rs:176:34:176:40 | res | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... | provenance | Config |
 | test_logging.rs:176:34:176:79 | MacroExpr | test_logging.rs:176:33:176:79 | &... [&ref] | provenance |  |
-| test_logging.rs:176:34:176:79 | res | test_logging.rs:176:42:176:78 | { ... } | provenance |  |
-| test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:34:176:79 | res | provenance |  |
+| test_logging.rs:176:42:176:78 | ...::format(...) | test_logging.rs:176:34:176:40 | res | provenance |  |
 | test_logging.rs:176:42:176:78 | ...::must_use(...) | test_logging.rs:176:34:176:79 | MacroExpr | provenance |  |
 | test_logging.rs:176:42:176:78 | MacroExpr | test_logging.rs:176:42:176:78 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:176:42:176:78 | { ... } | test_logging.rs:176:42:176:78 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:176:70:176:78 | password2 | test_logging.rs:176:42:176:78 | MacroExpr | provenance |  |
 | test_logging.rs:180:35:180:81 | &... | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:3 Sink:MaD:3 |
 | test_logging.rs:180:35:180:81 | &... [&ref] | test_logging.rs:180:24:180:33 | log_expect | provenance | MaD:3 Sink:MaD:3 |
+| test_logging.rs:180:36:180:42 | res | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... | provenance | Config |
 | test_logging.rs:180:36:180:81 | MacroExpr | test_logging.rs:180:35:180:81 | &... [&ref] | provenance |  |
-| test_logging.rs:180:36:180:81 | res | test_logging.rs:180:44:180:80 | { ... } | provenance |  |
-| test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:36:180:81 | res | provenance |  |
+| test_logging.rs:180:44:180:80 | ...::format(...) | test_logging.rs:180:36:180:42 | res | provenance |  |
 | test_logging.rs:180:44:180:80 | ...::must_use(...) | test_logging.rs:180:36:180:81 | MacroExpr | provenance |  |
 | test_logging.rs:180:44:180:80 | MacroExpr | test_logging.rs:180:44:180:80 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:180:44:180:80 | { ... } | test_logging.rs:180:44:180:80 | ...::must_use(...) | provenance | MaD:22 |
@@ -188,55 +188,55 @@ edges
 | test_logging.rs:187:47:187:60 | Err(...) [Err] | test_logging.rs:187:9:187:19 | err_result3 [Err] | provenance |  |
 | test_logging.rs:187:51:187:59 | password2 | test_logging.rs:187:47:187:60 | Err(...) [Err] | provenance |  |
 | test_logging.rs:188:13:188:23 | err_result3 [Err] | test_logging.rs:188:25:188:34 | log_unwrap | provenance | MaD:5 Sink:MaD:5 |
-| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:38 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
+| test_logging.rs:192:12:192:37 | MacroExpr | test_logging.rs:192:5:192:10 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
 | test_logging.rs:192:30:192:37 | password | test_logging.rs:192:12:192:37 | MacroExpr | provenance |  |
-| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:38 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
+| test_logging.rs:193:14:193:37 | MacroExpr | test_logging.rs:193:5:193:12 | ...::_print | provenance | MaD:15 Sink:MaD:15 |
 | test_logging.rs:193:30:193:37 | password | test_logging.rs:193:14:193:37 | MacroExpr | provenance |  |
-| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:39 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:194:13:194:38 | MacroExpr | test_logging.rs:194:5:194:11 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
 | test_logging.rs:194:31:194:38 | password | test_logging.rs:194:13:194:38 | MacroExpr | provenance |  |
-| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:39 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
+| test_logging.rs:195:15:195:38 | MacroExpr | test_logging.rs:195:5:195:13 | ...::_eprint | provenance | MaD:14 Sink:MaD:14 |
 | test_logging.rs:195:31:195:38 | password | test_logging.rs:195:15:195:38 | MacroExpr | provenance |  |
-| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:44 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:199:20:199:43 | MacroExpr | test_logging.rs:199:13:199:18 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:199:36:199:43 | password | test_logging.rs:199:20:199:43 | MacroExpr | provenance |  |
-| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:43 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:202:19:202:42 | MacroExpr | test_logging.rs:202:13:202:17 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:202:35:202:42 | password | test_logging.rs:202:19:202:42 | MacroExpr | provenance |  |
-| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:52 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:205:28:205:51 | MacroExpr | test_logging.rs:205:13:205:26 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:205:44:205:51 | password | test_logging.rs:205:28:205:51 | MacroExpr | provenance |  |
-| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:50 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:208:26:208:49 | MacroExpr | test_logging.rs:208:13:208:24 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:208:42:208:49 | password | test_logging.rs:208:26:208:49 | MacroExpr | provenance |  |
-| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:52 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:211:28:211:51 | MacroExpr | test_logging.rs:211:13:211:19 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:211:44:211:51 | password | test_logging.rs:211:28:211:51 | MacroExpr | provenance |  |
-| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:214:30:214:53 | MacroExpr | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:214:46:214:53 | password | test_logging.rs:214:30:214:53 | MacroExpr | provenance |  |
-| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:217:30:217:53 | MacroExpr | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:217:46:217:53 | password | test_logging.rs:217:30:217:53 | MacroExpr | provenance |  |
-| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:58 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
+| test_logging.rs:220:34:220:57 | MacroExpr | test_logging.rs:220:13:220:25 | ...::panic_fmt | provenance | MaD:11 Sink:MaD:11 |
 | test_logging.rs:220:50:220:57 | password | test_logging.rs:220:34:220:57 | MacroExpr | provenance |  |
-| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:223:36:223:59 | MacroExpr | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:223:52:223:59 | password | test_logging.rs:223:36:223:59 | MacroExpr | provenance |  |
-| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | Sink:MaD:9 |
-| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
-| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | provenance | MaD:10 |
+| test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed | provenance | Sink:MaD:9 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed | provenance | MaD:9 Sink:MaD:9 |
+| test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | provenance | MaD:10 |
 | test_logging.rs:226:36:226:59 | MacroExpr | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | provenance |  |
 | test_logging.rs:226:52:226:59 | password | test_logging.rs:226:36:226:59 | MacroExpr | provenance |  |
+| test_logging.rs:229:30:229:36 | res | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
 | test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:20 |
 | test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:18 |
 | test_logging.rs:229:30:229:62 | MacroExpr | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | provenance | MaD:20 |
-| test_logging.rs:229:30:229:62 | res | test_logging.rs:229:38:229:61 | { ... } | provenance |  |
 | test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | test_logging.rs:229:23:229:28 | expect | provenance | MaD:2 Sink:MaD:2 |
-| test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:30:229:62 | res | provenance |  |
+| test_logging.rs:229:38:229:61 | ...::format(...) | test_logging.rs:229:30:229:36 | res | provenance |  |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:62 | MacroExpr | provenance |  |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:20 |
 | test_logging.rs:229:38:229:61 | ...::must_use(...) | test_logging.rs:229:30:229:71 | ... .as_str() | provenance | MaD:18 |
@@ -244,48 +244,48 @@ edges
 | test_logging.rs:229:38:229:61 | MacroExpr | test_logging.rs:229:38:229:61 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:229:38:229:61 | { ... } | test_logging.rs:229:38:229:61 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:229:54:229:61 | password | test_logging.rs:229:38:229:61 | MacroExpr | provenance |  |
+| test_logging.rs:242:16:242:22 | res | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
 | test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | provenance | MaD:19 |
 | test_logging.rs:242:16:242:50 | MacroExpr | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:242:16:242:50 | res | test_logging.rs:242:24:242:49 | { ... } | provenance |  |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() | test_logging.rs:242:10:242:14 | write | provenance | MaD:7 Sink:MaD:7 |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | test_logging.rs:242:10:242:14 | write | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:16:242:50 | res | provenance |  |
+| test_logging.rs:242:24:242:49 | ...::format(...) | test_logging.rs:242:16:242:22 | res | provenance |  |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:50 | MacroExpr | provenance |  |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | MaD:19 |
 | test_logging.rs:242:24:242:49 | ...::must_use(...) | test_logging.rs:242:16:242:61 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:242:24:242:49 | MacroExpr | test_logging.rs:242:24:242:49 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:242:24:242:49 | { ... } | test_logging.rs:242:24:242:49 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:242:42:242:49 | password | test_logging.rs:242:24:242:49 | MacroExpr | provenance |  |
+| test_logging.rs:245:20:245:26 | res | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
 | test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | provenance | MaD:19 |
 | test_logging.rs:245:20:245:54 | MacroExpr | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:245:20:245:54 | res | test_logging.rs:245:28:245:53 | { ... } | provenance |  |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:8 Sink:MaD:8 |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | test_logging.rs:245:10:245:18 | write_all | provenance | MaD:8 Sink:MaD:8 |
-| test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:20:245:54 | res | provenance |  |
+| test_logging.rs:245:28:245:53 | ...::format(...) | test_logging.rs:245:20:245:26 | res | provenance |  |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:54 | MacroExpr | provenance |  |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | MaD:19 |
 | test_logging.rs:245:28:245:53 | ...::must_use(...) | test_logging.rs:245:20:245:65 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:245:28:245:53 | MacroExpr | test_logging.rs:245:28:245:53 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:245:28:245:53 | { ... } | test_logging.rs:245:28:245:53 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:245:46:245:53 | password | test_logging.rs:245:28:245:53 | MacroExpr | provenance |  |
+| test_logging.rs:248:15:248:21 | res | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
 | test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | provenance | MaD:19 |
 | test_logging.rs:248:15:248:49 | MacroExpr | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:248:15:248:49 | res | test_logging.rs:248:23:248:48 | { ... } | provenance |  |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() | test_logging.rs:248:9:248:13 | write | provenance | MaD:7 Sink:MaD:7 |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | test_logging.rs:248:9:248:13 | write | provenance | MaD:7 Sink:MaD:7 |
-| test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:15:248:49 | res | provenance |  |
+| test_logging.rs:248:23:248:48 | ...::format(...) | test_logging.rs:248:15:248:21 | res | provenance |  |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:49 | MacroExpr | provenance |  |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | MaD:19 |
 | test_logging.rs:248:23:248:48 | ...::must_use(...) | test_logging.rs:248:15:248:60 | ... .as_bytes() | provenance | MaD:17 |
 | test_logging.rs:248:23:248:48 | MacroExpr | test_logging.rs:248:23:248:48 | ...::format(...) | provenance | MaD:21 |
 | test_logging.rs:248:23:248:48 | { ... } | test_logging.rs:248:23:248:48 | ...::must_use(...) | provenance | MaD:22 |
 | test_logging.rs:248:41:248:48 | password | test_logging.rs:248:23:248:48 | MacroExpr | provenance |  |
+| test_logging.rs:251:15:251:21 | res | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
 | test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | provenance | MaD:19 |
 | test_logging.rs:251:15:251:49 | MacroExpr | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | provenance | MaD:17 |
-| test_logging.rs:251:15:251:49 | res | test_logging.rs:251:23:251:48 | { ... } | provenance |  |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() | test_logging.rs:251:9:251:13 | write | provenance | MaD:6 Sink:MaD:6 |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | test_logging.rs:251:9:251:13 | write | provenance | MaD:6 Sink:MaD:6 |
-| test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:15:251:49 | res | provenance |  |
+| test_logging.rs:251:23:251:48 | ...::format(...) | test_logging.rs:251:15:251:21 | res | provenance |  |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:49 | MacroExpr | provenance |  |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | MaD:19 |
 | test_logging.rs:251:23:251:48 | ...::must_use(...) | test_logging.rs:251:15:251:60 | ... .as_bytes() | provenance | MaD:17 |
@@ -316,43 +316,43 @@ models
 | 21 | Summary: alloc::fmt::format; Argument[0]; ReturnValue; taint |
 | 22 | Summary: core::hint::must_use; Argument[0]; ReturnValue; value |
 nodes
-| test_logging.rs:42:5:42:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:42:5:42:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:42:12:42:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:42:28:42:35 | password | semmle.label | password |
-| test_logging.rs:43:5:43:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:43:5:43:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:43:12:43:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:43:28:43:35 | password | semmle.label | password |
-| test_logging.rs:44:5:44:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:44:5:44:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:44:11:44:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:44:27:44:34 | password | semmle.label | password |
-| test_logging.rs:45:5:45:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:45:5:45:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:45:12:45:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:45:28:45:35 | password | semmle.label | password |
-| test_logging.rs:46:5:46:35 | ...::log | semmle.label | ...::log |
+| test_logging.rs:46:5:46:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:46:11:46:34 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:46:27:46:34 | password | semmle.label | password |
-| test_logging.rs:47:5:47:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:47:5:47:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:47:24:47:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:47:40:47:47 | password | semmle.label | password |
-| test_logging.rs:52:5:52:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:52:5:52:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:52:12:52:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:52:28:52:35 | password | semmle.label | password |
-| test_logging.rs:54:5:54:49 | ...::log | semmle.label | ...::log |
+| test_logging.rs:54:5:54:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:54:12:54:48 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:54:41:54:48 | password | semmle.label | password |
-| test_logging.rs:56:5:56:47 | ...::log | semmle.label | ...::log |
+| test_logging.rs:56:5:56:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:56:12:56:46 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:56:39:56:46 | password | semmle.label | password |
-| test_logging.rs:57:5:57:34 | ...::log | semmle.label | ...::log |
+| test_logging.rs:57:5:57:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:57:12:57:33 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:57:24:57:31 | password | semmle.label | password |
-| test_logging.rs:58:5:58:36 | ...::log | semmle.label | ...::log |
+| test_logging.rs:58:5:58:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:58:12:58:35 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:58:24:58:31 | password | semmle.label | password |
-| test_logging.rs:60:5:60:54 | ...::log | semmle.label | ...::log |
+| test_logging.rs:60:5:60:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:60:30:60:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:60:46:60:53 | password | semmle.label | password |
-| test_logging.rs:61:5:61:55 | ...::log | semmle.label | ...::log |
+| test_logging.rs:61:5:61:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:61:20:61:28 | &password | semmle.label | &password |
@@ -360,13 +360,13 @@ nodes
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0, &ref] | semmle.label | TupleExpr [tuple.0, &ref] |
 | test_logging.rs:61:20:61:28 | TupleExpr [tuple.0] | semmle.label | TupleExpr [tuple.0] |
 | test_logging.rs:61:21:61:28 | password | semmle.label | password |
-| test_logging.rs:65:5:65:48 | ...::log | semmle.label | ...::log |
+| test_logging.rs:65:5:65:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:65:24:65:47 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:65:40:65:47 | password | semmle.label | password |
-| test_logging.rs:67:5:67:66 | ...::log | semmle.label | ...::log |
+| test_logging.rs:67:5:67:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:67:42:67:65 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:67:58:67:65 | password | semmle.label | password |
-| test_logging.rs:68:5:68:67 | ...::log | semmle.label | ...::log |
+| test_logging.rs:68:5:68:8 | ...::log | semmle.label | ...::log |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0, &ref] | semmle.label | &... [&ref, tuple.0, &ref] |
 | test_logging.rs:68:18:68:26 | &... [&ref, tuple.0] | semmle.label | &... [&ref, tuple.0] |
 | test_logging.rs:68:18:68:26 | &password | semmle.label | &password |
@@ -374,13 +374,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:10 | ...::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:10 | ...::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:10 | ...::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 |
@@ -388,16 +388,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:10 | ...::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:10 | ...::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:10 | ...::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:10 | ...::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 |
@@ -405,49 +405,49 @@ 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:10 | ...::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 |
 | test_logging.rs:93:14:93:22 | &password | semmle.label | &password |
 | test_logging.rs:93:15:93:22 | password | semmle.label | password |
-| test_logging.rs:94:5:94:29 | ...::log | semmle.label | ...::log |
+| test_logging.rs:94:5:94:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:94:11:94:28 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:96:9:96:10 | m2 | semmle.label | m2 |
 | test_logging.rs:96:41:96:49 | &password | semmle.label | &password |
 | test_logging.rs:96:42:96:49 | password | semmle.label | password |
-| test_logging.rs:97:5:97:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:97:5:97:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:97:11:97:18 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:9:99:10 | m3 | semmle.label | m3 |
-| test_logging.rs:99:14:99:46 | res | semmle.label | res |
+| test_logging.rs:99:14:99:20 | res | semmle.label | res |
 | test_logging.rs:99:22:99:45 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:99:22:99:45 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:99:22:99:45 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:99:22:99:45 | { ... } | semmle.label | { ... } |
 | test_logging.rs:99:38:99:45 | password | semmle.label | password |
-| test_logging.rs:100:5:100:19 | ...::log | semmle.label | ...::log |
+| test_logging.rs:100:5:100:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:100:11:100:18 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:118:5:118:42 | ...::log | semmle.label | ...::log |
+| test_logging.rs:118:5:118:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:118:12:118:41 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:118:28:118:41 | get_password(...) | semmle.label | get_password(...) |
 | test_logging.rs:129:9:129:10 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:129:14:129:33 | TupleExpr [tuple.1] | semmle.label | TupleExpr [tuple.1] |
 | test_logging.rs:129:25:129:32 | password | semmle.label | password |
-| test_logging.rs:131:5:131:32 | ...::log | semmle.label | ...::log |
+| test_logging.rs:131:5:131:10 | ...::log | semmle.label | ...::log |
 | test_logging.rs:131:12:131:31 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:131:28:131:29 | t1 [tuple.1] | semmle.label | t1 [tuple.1] |
 | test_logging.rs:131:28:131:31 | t1.1 | semmle.label | t1.1 |
-| test_logging.rs:141:5:141:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:141:5:141:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:141:11:141:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:141:27:141:37 | s1.password | semmle.label | s1.password |
-| test_logging.rs:151:5:151:38 | ...::log | semmle.label | ...::log |
+| test_logging.rs:151:5:151:9 | ...::log | semmle.label | ...::log |
 | test_logging.rs:151:11:151:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:151:27:151:37 | s2.password | semmle.label | s2.password |
 | test_logging.rs:176:22:176:31 | log_expect | semmle.label | log_expect |
 | test_logging.rs:176:33:176:79 | &... | semmle.label | &... |
 | test_logging.rs:176:33:176:79 | &... [&ref] | semmle.label | &... [&ref] |
+| test_logging.rs:176:34:176:40 | res | semmle.label | res |
 | test_logging.rs:176:34:176:79 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:176:34:176:79 | res | semmle.label | res |
 | test_logging.rs:176:42:176:78 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:176:42:176:78 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:176:42:176:78 | MacroExpr | semmle.label | MacroExpr |
@@ -456,8 +456,8 @@ nodes
 | test_logging.rs:180:24:180:33 | log_expect | semmle.label | log_expect |
 | test_logging.rs:180:35:180:81 | &... | semmle.label | &... |
 | test_logging.rs:180:35:180:81 | &... [&ref] | semmle.label | &... [&ref] |
+| test_logging.rs:180:36:180:42 | res | semmle.label | res |
 | test_logging.rs:180:36:180:81 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:180:36:180:81 | res | semmle.label | res |
 | test_logging.rs:180:44:180:80 | ...::format(...) | semmle.label | ...::format(...) |
 | test_logging.rs:180:44:180:80 | ...::must_use(...) | semmle.label | ...::must_use(...) |
 | test_logging.rs:180:44:180:80 | MacroExpr | semmle.label | MacroExpr |
@@ -474,60 +474,60 @@ nodes
 | test_logging.rs:187:51:187:59 | password2 | semmle.label | password2 |
 | test_logging.rs:188:13:188:23 | err_result3 [Err] | semmle.label | err_result3 [Err] |
 | test_logging.rs:188:25:188:34 | log_unwrap | semmle.label | log_unwrap |
-| test_logging.rs:192:5:192:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:192:5:192:10 | ...::_print | semmle.label | ...::_print |
 | test_logging.rs:192:12:192:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:192:30:192:37 | password | semmle.label | password |
-| test_logging.rs:193:5:193:38 | ...::_print | semmle.label | ...::_print |
+| test_logging.rs:193:5:193:12 | ...::_print | semmle.label | ...::_print |
 | test_logging.rs:193:14:193:37 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:193:30:193:37 | password | semmle.label | password |
-| test_logging.rs:194:5:194:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:194:5:194:11 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:194:13:194:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:194:31:194:38 | password | semmle.label | password |
-| test_logging.rs:195:5:195:39 | ...::_eprint | semmle.label | ...::_eprint |
+| test_logging.rs:195:5:195:13 | ...::_eprint | semmle.label | ...::_eprint |
 | test_logging.rs:195:15:195:38 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:195:31:195:38 | password | semmle.label | password |
-| test_logging.rs:199:13:199:44 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:199:13:199:18 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:199:20:199:43 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:199:36:199:43 | password | semmle.label | password |
-| test_logging.rs:202:13:202:43 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:202:13:202:17 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:202:19:202:42 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:202:35:202:42 | password | semmle.label | password |
-| test_logging.rs:205:13:205:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:205:13:205:26 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:205:28:205:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:205:44:205:51 | password | semmle.label | password |
-| test_logging.rs:208:13:208:50 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:208:13:208:24 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:208:26:208:49 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:208:42:208:49 | password | semmle.label | password |
-| test_logging.rs:211:13:211:52 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:211:13:211:19 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:211:28:211:51 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:211:44:211:51 | password | semmle.label | password |
-| test_logging.rs:214:13:214:54 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:214:13:214:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:214:13:214:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:214:13:214:22 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:214:30:214:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:214:30:214:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:214:46:214:53 | password | semmle.label | password |
-| test_logging.rs:217:13:217:54 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:217:13:217:54 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:217:13:217:22 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:217:13:217:22 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:217:30:217:53 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:217:30:217:53 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:217:46:217:53 | password | semmle.label | password |
-| test_logging.rs:220:13:220:58 | ...::panic_fmt | semmle.label | ...::panic_fmt |
+| test_logging.rs:220:13:220:25 | ...::panic_fmt | semmle.label | ...::panic_fmt |
 | test_logging.rs:220:34:220:57 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:220:50:220:57 | password | semmle.label | password |
-| test_logging.rs:223:13:223:60 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:223:13:223:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:223:13:223:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:223:13:223:28 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:223:36:223:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:223:36:223:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:223:52:223:59 | password | semmle.label | password |
-| test_logging.rs:226:13:226:60 | ...::assert_failed | semmle.label | ...::assert_failed |
-| test_logging.rs:226:13:226:60 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
+| test_logging.rs:226:13:226:28 | ...::assert_failed | semmle.label | ...::assert_failed |
+| test_logging.rs:226:13:226:28 | ...::assert_failed [Some] | semmle.label | ...::assert_failed [Some] |
 | test_logging.rs:226:36:226:59 | ...::Some(...) [Some] | semmle.label | ...::Some(...) [Some] |
 | test_logging.rs:226:36:226:59 | MacroExpr | semmle.label | MacroExpr |
 | test_logging.rs:226:52:226:59 | password | semmle.label | password |
 | test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
 | test_logging.rs:229:23:229:28 | expect | semmle.label | expect |
+| test_logging.rs:229:30:229:36 | res | semmle.label | res |
 | test_logging.rs:229:30:229:62 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:229:30:229:62 | res | semmle.label | res |
 | test_logging.rs:229:30:229:71 | ... .as_str() | semmle.label | ... .as_str() |
 | test_logging.rs:229:30:229:71 | ... .as_str() [&ref] | semmle.label | ... .as_str() [&ref] |
 | test_logging.rs:229:38:229:61 | ...::format(...) | semmle.label | ...::format(...) |
@@ -536,8 +536,8 @@ nodes
 | test_logging.rs:229:38:229:61 | { ... } | semmle.label | { ... } |
 | test_logging.rs:229:54:229:61 | password | semmle.label | password |
 | test_logging.rs:242:10:242:14 | write | semmle.label | write |
+| test_logging.rs:242:16:242:22 | res | semmle.label | res |
 | test_logging.rs:242:16:242:50 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:242:16:242:50 | res | semmle.label | res |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:242:16:242:61 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:242:24:242:49 | ...::format(...) | semmle.label | ...::format(...) |
@@ -546,8 +546,8 @@ nodes
 | test_logging.rs:242:24:242:49 | { ... } | semmle.label | { ... } |
 | test_logging.rs:242:42:242:49 | password | semmle.label | password |
 | test_logging.rs:245:10:245:18 | write_all | semmle.label | write_all |
+| test_logging.rs:245:20:245:26 | res | semmle.label | res |
 | test_logging.rs:245:20:245:54 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:245:20:245:54 | res | semmle.label | res |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:245:20:245:65 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:245:28:245:53 | ...::format(...) | semmle.label | ...::format(...) |
@@ -556,8 +556,8 @@ nodes
 | test_logging.rs:245:28:245:53 | { ... } | semmle.label | { ... } |
 | test_logging.rs:245:46:245:53 | password | semmle.label | password |
 | test_logging.rs:248:9:248:13 | write | semmle.label | write |
+| test_logging.rs:248:15:248:21 | res | semmle.label | res |
 | test_logging.rs:248:15:248:49 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:248:15:248:49 | res | semmle.label | res |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:248:15:248:60 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:248:23:248:48 | ...::format(...) | semmle.label | ...::format(...) |
@@ -566,8 +566,8 @@ nodes
 | test_logging.rs:248:23:248:48 | { ... } | semmle.label | { ... } |
 | test_logging.rs:248:41:248:48 | password | semmle.label | password |
 | test_logging.rs:251:9:251:13 | write | semmle.label | write |
+| test_logging.rs:251:15:251:21 | res | semmle.label | res |
 | test_logging.rs:251:15:251:49 | MacroExpr | semmle.label | MacroExpr |
-| test_logging.rs:251:15:251:49 | res | semmle.label | res |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() | semmle.label | ... .as_bytes() |
 | test_logging.rs:251:15:251:60 | ... .as_bytes() [&ref] | semmle.label | ... .as_bytes() [&ref] |
 | test_logging.rs:251:23:251:48 | ...::format(...) | semmle.label | ...::format(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected
index f1395ff39ec0..ef0a9e0d8063 100644
--- a/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected
+++ b/rust/ql/test/query-tests/security/CWE-327/BrokenCryptoAlgorithm.expected
@@ -2,20 +2,22 @@
 | test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:23:27:23:60 | ...::new_from_slice(...) | The cryptographic algorithm RC4 |
 | test_cipher.rs:26:27:26:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:26:27:26:48 | ...::new(...) | The cryptographic algorithm RC4 |
 | test_cipher.rs:29:27:29:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:29:27:29:48 | ...::new(...) | The cryptographic algorithm RC4 |
-| test_cipher.rs:59:23:59:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:59:23:59:42 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:63:23:63:47 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:63:23:63:47 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:67:23:67:46 | ...::new_from_slice(...) | The cryptographic algorithm DES |
-| test_cipher.rs:71:23:71:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:71:23:71:42 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:75:27:75:46 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:75:27:75:46 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:80:24:80:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:80:24:80:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:59:29:59:45 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:59:29:59:45 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:63:23:63:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:63:23:63:42 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:67:23:67:47 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:67:23:67:47 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:71:23:71:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:71:23:71:46 | ...::new_from_slice(...) | The cryptographic algorithm DES |
+| test_cipher.rs:75:23:75:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:75:23:75:42 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:79:27:79:46 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:79:27:79:46 | ...::new(...) | The cryptographic algorithm DES |
 | test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:84:24:84:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:84:24:84:48 | ...::new(...) | The cryptographic algorithm DES |
 | test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:52 | ...::new_from_slice(...) | The cryptographic algorithm 3DES |
-| test_cipher.rs:97:23:97:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:97:23:97:42 | ...::new(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:101:23:101:46 | ...::new_from_slice(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:105:23:105:56 | ...::new_with_eff_key_len(...) | The cryptographic algorithm RC2 |
-| test_cipher.rs:110:23:110:50 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:110:23:110:50 | ...::new(...) | The cryptographic algorithm RC5 |
-| test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:114:23:114:55 | ...::new_from_slice(...) | The cryptographic algorithm RC5 |
-| test_cipher.rs:132:23:132:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:132:23:132:76 | ...::new(...) | The cryptographic algorithm DES |
-| test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:138:23:138:76 | ...::new_from_slices(...) | The cryptographic algorithm DES |
-| test_cipher.rs:141:23:141:76 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:141:23:141:76 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:88:24:88:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:88:24:88:48 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:92:24:92:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:48 | ...::new(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:92:24:92:48 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:92:24:92:48 | ...::new(...) | The cryptographic algorithm DES |
+| test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | The cryptographic algorithm 3DES |
+| test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:96:24:96:52 | ...::new_from_slice(...) | The cryptographic algorithm DES |
+| test_cipher.rs:101:23:101:42 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:101:23:101:42 | ...::new(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:105:23:105:46 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:105:23:105:46 | ...::new_from_slice(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:109:23:109:56 | ...::new_with_eff_key_len(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:109:23:109:56 | ...::new_with_eff_key_len(...) | The cryptographic algorithm RC2 |
+| test_cipher.rs:114:23:114:50 | ...::new(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:114:23:114:50 | ...::new(...) | The cryptographic algorithm RC5 |
+| test_cipher.rs:118:23:118:55 | ...::new_from_slice(...) | $@ is broken or weak, and should not be used. | test_cipher.rs:118:23:118:55 | ...::new_from_slice(...) | The cryptographic algorithm RC5 |
diff --git a/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected
index 3d73ede26c5f..50dd9e9f0ed2 100644
--- a/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-327/CONSISTENCY/PathResolutionConsistency.expected
@@ -4,4 +4,4 @@ multipleCallTargets
 | test_cipher.rs:29:27:29:48 | ...::new(...) |
 | test_cipher.rs:36:30:36:59 | ...::new(...) |
 | test_cipher.rs:39:30:39:63 | ...::new(...) |
-| test_cipher.rs:110:23:110:50 | ...::new(...) |
+| test_cipher.rs:114:23:114:50 | ...::new(...) |
diff --git a/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs b/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs
index 0cf20c4c2782..61471ac99ecf 100644
--- a/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs
+++ b/rust/ql/test/query-tests/security/CWE-327/test_cipher.rs
@@ -42,7 +42,7 @@ fn test_stream_cipher(
 
 fn test_block_cipher(
     key: &[u8], key128: &[u8;16], key192: &[u8;24], key256: &[u8;32],
-    data: &mut [u8], input: &[u8], block128: &mut [u8;16]
+    data: &mut [u8], input: &[u8], block128: &mut [u8;16], des_key : &cipher::Key<Des>
 ) {
     // aes
     let aes_cipher1 = Aes128::new(key128.into());
@@ -56,6 +56,10 @@ fn test_block_cipher(
     aes_cipher3.decrypt_block(block128.into());
 
     // des (broken)
+    let des_cipher0 : Des = Des::new(des_key); // $ Alert[rust/weak-cryptographic-algorithm]
+    des_cipher0.encrypt_block(data.into());
+    des_cipher0.decrypt_block(data.into());
+
     let des_cipher1 = Des::new(key.into()); // $ Alert[rust/weak-cryptographic-algorithm]
     des_cipher1.encrypt_block(data.into());
     des_cipher1.decrypt_block(data.into());
@@ -129,15 +133,15 @@ fn test_cbc(
     _ = aes_cipher1.encrypt_padded_mut::<aes::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
     // des (broken)
-    let des_cipher1 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher1 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher1.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
     let des_cipher2 = MyDesEncryptor::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher2.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
-    let des_cipher3 = cbc::Encryptor::<des::Des>::new_from_slices(&key, &iv).unwrap(); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher3 = cbc::Encryptor::<des::Des>::new_from_slices(&key, &iv).unwrap(); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher3.encrypt_padded_mut::<des::cipher::block_padding::Pkcs7>(data, data_len).unwrap();
 
-    let des_cipher4 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ Alert[rust/weak-cryptographic-algorithm]
+    let des_cipher4 = cbc::Encryptor::<des::Des>::new(key.into(), iv.into()); // $ MISSING: Alert[rust/weak-cryptographic-algorithm]
     _ = des_cipher4.encrypt_padded_b2b_mut::<des::cipher::block_padding::Pkcs7>(input, data).unwrap();
 }
diff --git a/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 7c37a0082680..000000000000
--- a/rust/ql/test/query-tests/security/CWE-696/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,14 +0,0 @@
-multiplePathResolutions
-| test.rs:50:3:50:6 | ctor |
-| test.rs:55:3:55:6 | ctor |
-| test.rs:60:3:60:6 | ctor |
-| test.rs:65:3:65:6 | ctor |
-| test.rs:73:3:73:6 | ctor |
-| test.rs:78:3:78:6 | ctor |
-| test.rs:87:3:87:6 | ctor |
-| test.rs:94:3:94:6 | ctor |
-| test.rs:128:3:128:6 | ctor |
-| test.rs:139:3:139:6 | ctor |
-| test.rs:144:3:144:6 | ctor |
-| test.rs:150:3:150:6 | ctor |
-| test.rs:168:3:168:6 | ctor |
diff --git a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
deleted file mode 100644
index 6e88d5bdf866..000000000000
--- a/rust/ql/test/query-tests/security/CWE-770/CONSISTENCY/PathResolutionConsistency.expected
+++ /dev/null
@@ -1,18 +0,0 @@
-multipleCallTargets
-| main.rs:218:14:218:30 | ...::malloc(...) |
-| main.rs:219:13:219:27 | ...::malloc(...) |
-| main.rs:220:13:220:37 | ...::aligned_alloc(...) |
-| main.rs:221:13:221:37 | ...::aligned_alloc(...) |
-| main.rs:222:13:222:31 | ...::calloc(...) |
-| main.rs:223:13:223:55 | ...::calloc(...) |
-| main.rs:224:13:224:32 | ...::realloc(...) |
-| main.rs:229:13:229:40 | ...::with_capacity(...) |
-| main.rs:233:18:233:47 | ...::with_capacity(...) |
-multiplePathResolutions
-| main.rs:218:14:218:17 | libc |
-| main.rs:219:13:219:16 | libc |
-| main.rs:220:13:220:16 | libc |
-| main.rs:221:13:221:16 | libc |
-| main.rs:222:13:222:16 | libc |
-| main.rs:223:13:223:16 | libc |
-| main.rs:224:13:224:16 | libc |
diff --git a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
index bae744c08869..0010127c5bbb 100644
--- a/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/AccessAfterLifetime.expected
@@ -22,6 +22,7 @@
 | lifetime.rs:667:14:667:17 | ref1 | lifetime.rs:655:11:655:25 | &raw const str2 | lifetime.rs:667:14:667:17 | ref1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:651:7:651:10 | str2 | str2 |
 | lifetime.rs:789:12:789:13 | p1 | lifetime.rs:781:9:781:19 | &my_local10 | lifetime.rs:789:12:789:13 | p1 | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:779:6:779:15 | my_local10 | my_local10 |
 | lifetime.rs:808:23:808:25 | ptr | lifetime.rs:798:9:798:12 | &val | lifetime.rs:808:23:808:25 | ptr | Access of a pointer to $@ after its lifetime has ended. | lifetime.rs:796:6:796:8 | val | val |
+| main.rs:64:23:64:24 | p2 | main.rs:44:26:44:28 | &b2 | main.rs:64:23:64:24 | p2 | Access of a pointer to $@ after its lifetime has ended. | main.rs:43:13:43:14 | b2 | b2 |
 edges
 | deallocation.rs:148:6:148:7 | p1 | deallocation.rs:151:14:151:15 | p1 | provenance |  |
 | deallocation.rs:148:6:148:7 | p1 | deallocation.rs:158:14:158:15 | p1 | provenance |  |
@@ -163,7 +164,7 @@ edges
 | lifetime.rs:443:6:443:7 | p1 | lifetime.rs:446:13:446:14 | p1 | provenance |  |
 | lifetime.rs:443:6:443:7 | p1 | lifetime.rs:450:2:450:10 | return p1 | provenance |  |
 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | lifetime.rs:443:6:443:7 | p1 | provenance |  |
-| lifetime.rs:443:42:443:43 | r1 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | provenance | MaD:1 |
+| lifetime.rs:443:42:443:43 | r1 | lifetime.rs:443:23:443:44 | ...::from_ref(...) | provenance | MaD:3 |
 | lifetime.rs:450:2:450:10 | return p1 | lifetime.rs:454:11:454:29 | get_ptr_from_ref(...) | provenance |  |
 | lifetime.rs:450:2:450:10 | return p1 | lifetime.rs:460:13:460:31 | get_ptr_from_ref(...) | provenance |  |
 | lifetime.rs:454:6:454:7 | p1 | lifetime.rs:459:13:459:14 | p1 | provenance |  |
@@ -197,11 +198,13 @@ edges
 | lifetime.rs:719:26:719:34 | &... | lifetime.rs:718:7:718:8 | r1 | provenance |  |
 | lifetime.rs:730:6:730:7 | r1 | lifetime.rs:734:12:734:13 | r1 | provenance |  |
 | lifetime.rs:730:11:730:25 | e1.test_match() | lifetime.rs:730:6:730:7 | r1 | provenance |  |
-| lifetime.rs:766:2:766:13 | &val | lifetime.rs:766:2:766:13 | ptr | provenance |  |
-| lifetime.rs:766:2:766:13 | ptr | lifetime.rs:767:2:767:13 | ptr | provenance |  |
+| lifetime.rs:766:2:766:11 | &val | lifetime.rs:766:2:766:11 | ptr | provenance |  |
+| lifetime.rs:766:2:766:11 | ptr | lifetime.rs:766:2:766:11 | ptr | provenance |  |
+| lifetime.rs:767:2:767:11 | &val | lifetime.rs:767:2:767:11 | ptr | provenance |  |
+| lifetime.rs:767:2:767:11 | ptr | lifetime.rs:767:2:767:11 | ptr | provenance |  |
 | lifetime.rs:769:6:769:8 | ptr | lifetime.rs:771:12:771:14 | ptr | provenance |  |
-| lifetime.rs:769:12:769:23 | &val | lifetime.rs:769:12:769:23 | ptr | provenance |  |
-| lifetime.rs:769:12:769:23 | ptr | lifetime.rs:769:6:769:8 | ptr | provenance |  |
+| lifetime.rs:769:12:769:21 | &val | lifetime.rs:769:12:769:21 | ptr | provenance |  |
+| lifetime.rs:769:12:769:21 | ptr | lifetime.rs:769:6:769:8 | ptr | provenance |  |
 | lifetime.rs:781:2:781:19 | return ... | lifetime.rs:785:11:785:41 | get_local_for_unsafe_function(...) | provenance |  |
 | lifetime.rs:781:9:781:19 | &my_local10 | lifetime.rs:781:2:781:19 | return ... | provenance |  |
 | lifetime.rs:785:6:785:7 | p1 | lifetime.rs:789:12:789:13 | p1 | provenance |  |
@@ -210,8 +213,21 @@ edges
 | lifetime.rs:798:9:798:12 | &val | lifetime.rs:798:2:798:12 | return ... | provenance |  |
 | lifetime.rs:802:6:802:8 | ptr | lifetime.rs:808:23:808:25 | ptr | provenance |  |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | lifetime.rs:802:6:802:8 | ptr | provenance |  |
+| main.rs:18:9:18:10 | p1 [&ref] | main.rs:21:19:21:20 | p1 | provenance |  |
+| main.rs:18:9:18:10 | p1 [&ref] | main.rs:29:19:29:20 | p1 | provenance |  |
+| main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | main.rs:18:9:18:10 | p1 [&ref] | provenance |  |
+| main.rs:18:26:18:28 | &b1 | main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | provenance | MaD:2 |
+| main.rs:44:9:44:10 | p2 [&ref] | main.rs:51:23:51:24 | p2 | provenance |  |
+| main.rs:44:9:44:10 | p2 [&ref] | main.rs:64:23:64:24 | p2 | provenance |  |
+| main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | main.rs:44:9:44:10 | p2 [&ref] | provenance |  |
+| main.rs:44:26:44:28 | &b2 | main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | provenance | MaD:2 |
+| main.rs:47:9:47:10 | p3 [&ref] | main.rs:52:23:52:24 | p3 | provenance |  |
+| main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | main.rs:47:9:47:10 | p3 [&ref] | provenance |  |
+| main.rs:47:30:47:36 | &mut b3 | main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | provenance | MaD:1 |
 models
-| 1 | Summary: core::ptr::from_ref; Argument[0]; ReturnValue; value |
+| 1 | Summary: <alloc::boxed::Box>::as_mut_ptr; Argument[0].Reference.Reference; ReturnValue.Reference; value |
+| 2 | Summary: <alloc::boxed::Box>::as_ptr; Argument[0].Reference.Reference; ReturnValue.Reference; value |
+| 3 | Summary: core::ptr::from_ref; Argument[0]; ReturnValue; value |
 nodes
 | deallocation.rs:148:6:148:7 | p1 | semmle.label | p1 |
 | deallocation.rs:148:30:148:38 | &raw const my_buffer | semmle.label | &raw const my_buffer |
@@ -418,12 +434,15 @@ nodes
 | lifetime.rs:730:6:730:7 | r1 | semmle.label | r1 |
 | lifetime.rs:730:11:730:25 | e1.test_match() | semmle.label | e1.test_match() |
 | lifetime.rs:734:12:734:13 | r1 | semmle.label | r1 |
-| lifetime.rs:766:2:766:13 | &val | semmle.label | &val |
-| lifetime.rs:766:2:766:13 | ptr | semmle.label | ptr |
-| lifetime.rs:767:2:767:13 | ptr | semmle.label | ptr |
+| lifetime.rs:766:2:766:11 | &val | semmle.label | &val |
+| lifetime.rs:766:2:766:11 | ptr | semmle.label | ptr |
+| lifetime.rs:766:2:766:11 | ptr | semmle.label | ptr |
+| lifetime.rs:767:2:767:11 | &val | semmle.label | &val |
+| lifetime.rs:767:2:767:11 | ptr | semmle.label | ptr |
+| lifetime.rs:767:2:767:11 | ptr | semmle.label | ptr |
 | lifetime.rs:769:6:769:8 | ptr | semmle.label | ptr |
-| lifetime.rs:769:12:769:23 | &val | semmle.label | &val |
-| lifetime.rs:769:12:769:23 | ptr | semmle.label | ptr |
+| lifetime.rs:769:12:769:21 | &val | semmle.label | &val |
+| lifetime.rs:769:12:769:21 | ptr | semmle.label | ptr |
 | lifetime.rs:771:12:771:14 | ptr | semmle.label | ptr |
 | lifetime.rs:781:2:781:19 | return ... | semmle.label | return ... |
 | lifetime.rs:781:9:781:19 | &my_local10 | semmle.label | &my_local10 |
@@ -435,4 +454,18 @@ nodes
 | lifetime.rs:802:6:802:8 | ptr | semmle.label | ptr |
 | lifetime.rs:802:12:802:24 | get_pointer(...) | semmle.label | get_pointer(...) |
 | lifetime.rs:808:23:808:25 | ptr | semmle.label | ptr |
+| main.rs:18:9:18:10 | p1 [&ref] | semmle.label | p1 [&ref] |
+| main.rs:18:14:18:29 | ...::as_ptr(...) [&ref] | semmle.label | ...::as_ptr(...) [&ref] |
+| main.rs:18:26:18:28 | &b1 | semmle.label | &b1 |
+| main.rs:21:19:21:20 | p1 | semmle.label | p1 |
+| main.rs:29:19:29:20 | p1 | semmle.label | p1 |
+| main.rs:44:9:44:10 | p2 [&ref] | semmle.label | p2 [&ref] |
+| main.rs:44:14:44:29 | ...::as_ptr(...) [&ref] | semmle.label | ...::as_ptr(...) [&ref] |
+| main.rs:44:26:44:28 | &b2 | semmle.label | &b2 |
+| main.rs:47:9:47:10 | p3 [&ref] | semmle.label | p3 [&ref] |
+| main.rs:47:14:47:37 | ...::as_mut_ptr(...) [&ref] | semmle.label | ...::as_mut_ptr(...) [&ref] |
+| main.rs:47:30:47:36 | &mut b3 | semmle.label | &mut b3 |
+| main.rs:51:23:51:24 | p2 | semmle.label | p2 |
+| main.rs:52:23:52:24 | p3 | semmle.label | p3 |
+| main.rs:64:23:64:24 | p2 | semmle.label | p2 |
 subpaths
diff --git a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
index 22e607bfa486..d13271f5fe6e 100644
--- a/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/security/CWE-825/CONSISTENCY/PathResolutionConsistency.expected
@@ -1,6 +1,4 @@
 multipleCallTargets
-| deallocation.rs:106:16:106:32 | ...::malloc(...) |
-| deallocation.rs:112:3:112:41 | ...::free(...) |
 | deallocation.rs:260:11:260:29 | ...::from(...) |
 | deallocation.rs:261:11:261:29 | ...::from(...) |
 | lifetime.rs:610:13:610:31 | ...::from(...) |
@@ -9,7 +7,3 @@ multipleCallTargets
 | lifetime.rs:612:41:612:52 | bar.as_str() |
 | lifetime.rs:628:13:628:31 | ...::from(...) |
 | lifetime.rs:629:32:629:43 | baz.as_str() |
-multiplePathResolutions
-| deallocation.rs:106:16:106:19 | libc |
-| deallocation.rs:112:3:112:6 | libc |
-| deallocation.rs:112:29:112:32 | libc |
diff --git a/rust/ql/test/query-tests/security/CWE-825/main.rs b/rust/ql/test/query-tests/security/CWE-825/main.rs
index 5f66313ae85e..8d1f2a421469 100644
--- a/rust/ql/test/query-tests/security/CWE-825/main.rs
+++ b/rust/ql/test/query-tests/security/CWE-825/main.rs
@@ -7,197 +7,201 @@ mod lifetime;
 use lifetime::*;
 
 fn use_the_heap() {
-	let _a = Box::new(0x7FFFFFFF);
-	let _b = Box::new(0x7FFFFFFF);
+    let _a = Box::new(0x7FFFFFFF);
+    let _b = Box::new(0x7FFFFFFF);
 }
 
 // --- boxes ---
 
 pub fn test_boxes_into() {
-	let b1: Box<i64> = Box::new(7); // b1 owns the memory for '50'
-	let p1 = Box::as_ptr(&b1); // b1 still owns the memory
+    let b1: Box<i64> = Box::new(7); // b1 owns the memory for '50'
+    let p1 = Box::as_ptr(&b1); // b1 still owns the memory
 
-	unsafe {
-		let v1 = *p1; // GOOD
-		println!("	v1 = {v1}");
-	}
+    unsafe {
+        let v1 = *p1; // GOOD
+        println!("	v1 = {v1}");
+    }
 
-	let v2 = Box::into_inner(b1); // b1 is explicitly freed here, thus p1 is dangling
-	println!("	v2 = {v2}");
+    let v2 = Box::into_inner(b1); // b1 is explicitly freed here, thus p1 is dangling
+    println!("	v2 = {v2}");
 
-	unsafe {
-		let v3 = *p1; // $ MISSING: Alert
-		println!("	v3 = {v3} (!)"); // corrupt in practice
-	}
+    unsafe {
+        let v3 = *p1; // $ MISSING: Alert
+        println!("	v3 = {v3} (!)"); // corrupt in practice
+    }
 }
 
 pub fn test_boxes_1(mode: i32) {
-	let p1: *const i64;
-	let p2: *const i64;
-	let p3: *mut i64;
-
-	{
-		let b1: Box<i64> = Box::new(1);
-		p1 = Box::into_raw(b1); // now owned by p1
-
-		let b2: Box<i64> = Box::new(2);
-		p2 = Box::as_ptr(&b2); // still owned by b2
-
-		let mut b3: Box<i64> = Box::new(3);
-		p3 = Box::as_mut_ptr(&mut b3); // still owned by b3
-
-		unsafe {
-			let v1 = *p1; // GOOD
-			let v2 = *p2; // GOOD
-			let v3 = *p3; // GOOD
-			println!("	v1 = {v1}");
-			println!("	v2 = {v2}");
-			println!("	v3 = {v3}");
-			*p3 = 4;
-		}
-	} // (b2, b3 go out of scope, thus p2, p3 are dangling)
-
-	unsafe {
-		if mode == 0 {
-			// reads
-			let v4 = *p1; // GOOD
-			let v5 = *p2; // $ MISSING: Alert
-			let v6 = *p3; // $ MISSING: Alert
-			println!("	v4 = {v4}");
-			println!("	v5 = {v5} (!)"); // corrupt in practice
-			println!("	v6 = {v6} (!)"); // corrupt in practice
-		}
-		if mode == 10 {
-			// write
-			*p3 = 5; // $ MISSING: Alert
-			use_the_heap(); // "malloc: Heap corruption detected"
-		}
-	}
+    let p1: *const i64;
+    let p2: *const i64;
+    let p3: *mut i64;
+
+    {
+        let b1: Box<i64> = Box::new(1);
+        p1 = Box::into_raw(b1); // now owned by p1
+
+        let b2: Box<i64> = Box::new(2);
+        p2 = Box::as_ptr(&b2); // $ Source[rust/access-after-lifetime-ended]=b2 -- still owned by b2
+
+        let mut b3: Box<i64> = Box::new(3);
+        p3 = Box::as_mut_ptr(&mut b3); // still owned by b3
+
+        unsafe {
+            let v1 = *p1; // GOOD
+            let v2 = *p2; // GOOD
+            let v3 = *p3; // GOOD
+            println!("	v1 = {v1}");
+            println!("	v2 = {v2}");
+            println!("	v3 = {v3}");
+            *p3 = 4;
+        }
+    } // (b2, b3 go out of scope, thus p2, p3 are dangling)
+
+    unsafe {
+        if mode == 0 {
+            // reads
+            let v4 = *p1; // GOOD
+            let v5 = *p2; // $ Alert[rust/access-after-lifetime-ended]=b2
+            let v6 = *p3; // $ MISSING: Alert
+            println!("	v4 = {v4}");
+            println!("	v5 = {v5} (!)"); // corrupt in practice
+            println!("	v6 = {v6} (!)"); // corrupt in practice
+        }
+        if mode == 10 {
+            // write
+            *p3 = 5; // $ MISSING: Alert
+            use_the_heap(); // "malloc: Heap corruption detected"
+        }
+    }
 }
 
 pub fn test_boxes_2() {
-	let b1: Box<i64> = Box::new(6); // b1 owns the memory
-	let p1 = Box::into_raw(b1); // now p1 owns the memory
+    let b1: Box<i64> = Box::new(6); // b1 owns the memory
+    let p1 = Box::into_raw(b1); // now p1 owns the memory
 
-	unsafe {
-		let _b2 = Box::from_raw(p1); // now _b2 owns the memory
+    unsafe {
+        let _b2 = Box::from_raw(p1); // now _b2 owns the memory
 
-		let v1 = *p1; // GOOD
-		println!("	v1 = {v1}");
-	} // (_b2 goes out of scope, thus the memory is freed and p1 is dangling)
+        let v1 = *p1; // GOOD
+        println!("	v1 = {v1}");
+    } // (_b2 goes out of scope, thus the memory is freed and p1 is dangling)
 
-	unsafe {
-		let v2 = *p1; // $ MISSING: Alert
-		println!("	v2 = {v2} (!)"); // corrupt in practice
-	}
+    unsafe {
+        let v2 = *p1; // $ MISSING: Alert
+        println!("	v2 = {v2} (!)"); // corrupt in practice
+    }
 }
 
 // --- main ---
 
 fn main() {
-	let mode = std::env::args().nth(1).unwrap_or("0".to_string()).parse::<i32>().unwrap_or(0);
-		// mode = which test cases to explore (0 should be safe; some will crash / segfault).
-	println!("mode = {mode}");
+    let mode = std::env::args()
+        .nth(1)
+        .unwrap_or("0".to_string())
+        .parse::<i32>()
+        .unwrap_or(0);
+    // mode = which test cases to explore (0 should be safe; some will crash / segfault).
+    println!("mode = {mode}");
 
-	println!("test_boxes_into:");
-	test_boxes_into();
+    println!("test_boxes_into:");
+    test_boxes_into();
 
-	println!("test_boxes_1:");
-	test_boxes_1(mode);
+    println!("test_boxes_1:");
+    test_boxes_1(mode);
 
-	println!("test_boxes_2:");
-	test_boxes_2();
+    println!("test_boxes_2:");
+    test_boxes_2();
 
-	// ---
+    // ---
 
-	println!("test_alloc:");
-	test_alloc(mode);
+    println!("test_alloc:");
+    test_alloc(mode);
 
-	println!("test_alloc_array:");
-	test_alloc_array(mode);
+    println!("test_alloc_array:");
+    test_alloc_array(mode);
 
-	println!("test_libc:");
-	test_libc();
+    println!("test_libc:");
+    test_libc();
 
-	println!("test_ptr_invalid:");
-	test_ptr_invalid(mode);
+    println!("test_ptr_invalid:");
+    test_ptr_invalid(mode);
 
-	println!("test_drop:");
-	test_drop();
+    println!("test_drop:");
+    test_drop();
 
-	println!("test_ptr_drop:");
-	test_ptr_drop(mode);
+    println!("test_ptr_drop:");
+    test_ptr_drop(mode);
 
-	println!("test_qhelp_tests:");
-	test_qhelp_examples();
+    println!("test_qhelp_tests:");
+    test_qhelp_examples();
 
-	println!("test_vec_reserve:");
-	test_vec_reserve();
+    println!("test_vec_reserve:");
+    test_vec_reserve();
 
-	// ---
+    // ---
 
-	println!("test_local_dangling:");
-	test_local_dangling();
+    println!("test_local_dangling:");
+    test_local_dangling();
 
-	println!("test_local_in_scope:");
-	test_local_in_scope(mode);
+    println!("test_local_in_scope:");
+    test_local_in_scope(mode);
 
-	println!("test_static:");
-	test_static(mode);
+    println!("test_static:");
+    test_static(mode);
 
-	println!("test_call_contexts:");
-	test_call_contexts();
+    println!("test_call_contexts:");
+    test_call_contexts();
 
-	println!("test_call_contexts_rec:");
-	test_call_contexts_rec();
+    println!("test_call_contexts_rec:");
+    test_call_contexts_rec();
 
-	println!("test_loop:");
-	test_loop();
+    println!("test_loop:");
+    test_loop();
 
-	println!("test_enums:");
-	test_enums();
+    println!("test_enums:");
+    test_enums();
 
-	println!("test_recursive_enums:");
-	test_recursive_enums();
+    println!("test_recursive_enums:");
+    test_recursive_enums();
 
-	println!("test_ptr_to_struct:");
-	test_ptr_to_struct(mode);
+    println!("test_ptr_to_struct:");
+    test_ptr_to_struct(mode);
 
-	println!("test_ptr_from_ref:");
-	test_ptr_from_ref();
+    println!("test_ptr_from_ref:");
+    test_ptr_from_ref();
 
-	println!("test_rc:");
-	test_rc();
+    println!("test_rc:");
+    test_rc();
 
-	println!("test_closures:");
-	test_closures();
+    println!("test_closures:");
+    test_closures();
 
-	println!("test_async:");
-	test_async();
+    println!("test_async:");
+    test_async();
 
-	println!("test_lifetime_annotations:");
-	test_lifetime_annotations();
+    println!("test_lifetime_annotations:");
+    test_lifetime_annotations();
 
-	println!("test_implicit_derefs:");
-	test_implicit_derefs();
+    println!("test_implicit_derefs:");
+    test_implicit_derefs();
 
-	println!("test_members:");
-	test_members();
+    println!("test_members:");
+    test_members();
 
-	println!("test_enum_members:");
-	test_enum_members();
+    println!("test_enum_members:");
+    test_enum_members();
 
-	println!("test_macros:");
-	test_macros();
+    println!("test_macros:");
+    test_macros();
 
-	println!("test_unsafe_function:");
-	unsafe {
-		test_unsafe_function();
-	}
+    println!("test_unsafe_function:");
+    unsafe {
+        test_unsafe_function();
+    }
 
-	println!("test_lifetimes_example_bad:");
-	test_lifetimes_example_bad();
+    println!("test_lifetimes_example_bad:");
+    test_lifetimes_example_bad();
 
-	println!("test_lifetimes_example_good:");
-	test_lifetimes_example_good();
+    println!("test_lifetimes_example_good:");
+    test_lifetimes_example_good();
 }
diff --git a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
deleted file mode 100644
index f3834c238893..000000000000
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/ExtractionConsistency.expected
+++ /dev/null
@@ -1,2 +0,0 @@
-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/CONSISTENCY/PathResolutionConsistency.expected b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
index 1d3672a258a9..4d2cdee53ce5 100644
--- a/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
+++ b/rust/ql/test/query-tests/unusedentities/CONSISTENCY/PathResolutionConsistency.expected
@@ -2,5 +2,5 @@ multipleCallTargets
 | main.rs:14:13:14:29 | ...::from(...) |
 | main.rs:15:13:15:29 | ...::from(...) |
 | unreachable.rs:165:20:165:42 | ...::from(...) |
-| unreachable.rs:171:9:171:17 | ...::from(...) |
+| unreachable.rs:171:9:171:15 | ...::from(...) |
 | unreachable.rs:177:17:177:25 | ...::from(...) |
diff --git a/rust/schema/annotations.py b/rust/schema/annotations.py
index 8295cd5860b0..371493926756 100644
--- a/rust/schema/annotations.py
+++ b/rust/schema/annotations.py
@@ -252,7 +252,7 @@ class _:
     attrs: drop
 
 
-@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, add_bases=(Resolvable,), cfg=True)
+@annotate(MethodCallExpr, replace_bases={Expr: CallExprBase}, cfg=True)
 class _:
     """
     A method call expression. For example:
@@ -434,8 +434,8 @@ class _:
     ```rust
     let first = Foo { a: 1, b: 2 };
     let second = Foo { a: 2, ..first };
-    Foo { a: 1, b: 2 }[2] = 10;
-    Foo { .. } = second;
+    let n = Foo { a: 1, b: 2 }.b;
+    Foo { a: m, .. } = second;
     ```
     """
     path: drop
@@ -547,10 +547,13 @@ class _:
     |x| x + 1;
     move |x: i32| -> i32 { x + 1 };
     async |x: i32, y| x + y;
-     #[coroutine]
+    #[coroutine]
     |x| yield x;
-     #[coroutine]
-     static |x| yield x;
+    #[coroutine]
+    static |x| yield x;
+    for<T: std::fmt::Debug> |x: T| {
+        println!("{:?}", x);
+    };
     ```
     """
 
@@ -560,8 +563,9 @@ class _:
     """
     A tuple expression. For example:
     ```rust
-    (1, "one");
-    (2, "two")[0] = 3;
+    let tuple = (1, "one");
+    let n = (2, "two").0;
+    let (a, b) = tuple;
     ```
     """
 
@@ -967,10 +971,10 @@ class _:
     """
 
 
-@annotate(ClosureBinder)
+@annotate(ForBinder)
 class _:
     """
-    A closure binder, specifying lifetime or type parameters for a closure.
+    A for binder, specifying lifetime or type parameters for a closure or a type.
 
     For example:
     ```rust
@@ -1155,21 +1159,15 @@ class _:
 @annotate(ForTypeRepr)
 class _:
     """
-    A higher-ranked trait bound.
+    A function pointer type with a `for` modifier.
 
     For example:
     ```rust
-    fn foo<T>(value: T)
-    where
-        T: for<'a> Fn(&'a str) -> &'a str
-    //     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-    {
-        // ...
-    }
+    type RefOp<X> = for<'a> fn(&'a X) -> &'a X;
+    //              ^^^^^^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
-
 @annotate(FormatArgsArg, cfg=True)
 @qltest.test_with(FormatArgsExpr)
 class _:
@@ -1407,17 +1405,25 @@ class _:
     """
 
 
-@annotate(MacroBlockExpr, replace_bases={AstNode: Expr}, cfg=True)
-@rust.doc_test_signature(None)
-class _:
+class MacroBlockExpr(Expr):
     """
     A sequence of statements generated by a `MacroCall`. For example:
     ```rust
-    fn main() {
-        println!("Hello, world!"); // This macro expands into a list of statements
+    macro_rules! my_macro {
+        () => {
+            let mut x = 40;
+            x += 2;
+            x
+        };
     }
+
+    my_macro!();  // this macro expands to a sequence of statements (and an expression)
     ```
     """
+    __cfg__ = True
+
+    statements: list[Stmt] | child
+    tail_expr: optional[Expr] | child
 
 
 @annotate(MacroTypeRepr)
@@ -1984,6 +1990,8 @@ class _:
     ```rust
     fn foo<T: Debug>(t: T) {}
     //        ^^^^^
+    fn bar(value: impl for<'a> From<&'a str>) {}
+    //                 ^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
@@ -2123,6 +2131,8 @@ class _:
     ```rust
     fn foo<T, U>(t: T, u: U) where T: Debug, U: Clone {}
     //                             ^^^^^^^^  ^^^^^^^^
+    fn bar<T>(value: T) where for<'a> T: From<&'a str> {}
+    //                        ^^^^^^^^^^^^^^^^^^^^^^^^
     ```
     """
 
diff --git a/rust/schema/ast.py b/rust/schema/ast.py
index 137e56f8bace..c9c0d4e7ddb5 100644
--- a/rust/schema/ast.py
+++ b/rust/schema/ast.py
@@ -69,7 +69,7 @@ class AsmConst(AsmOperand, ):
 class AsmDirSpec(AstNode, ):
     pass
 
-class AsmExpr(Expr, ):
+class AsmExpr(Expr, Item, ):
     asm_pieces: list["AsmPiece"] | child
     attrs: list["Attr"] | child
     template: list["Expr"] | child
@@ -162,13 +162,10 @@ class CastExpr(Expr, ):
     expr: optional["Expr"] | child
     type_repr: optional["TypeRepr"] | child
 
-class ClosureBinder(AstNode, ):
-    generic_param_list: optional["GenericParamList"] | child
-
 class ClosureExpr(Expr, ):
     attrs: list["Attr"] | child
     body: optional["Expr"] | child
-    closure_binder: optional["ClosureBinder"] | child
+    for_binder: optional["ForBinder"] | child
     is_async: predicate
     is_const: predicate
     is_gen: predicate
@@ -265,6 +262,9 @@ class FnPtrTypeRepr(TypeRepr, ):
     param_list: optional["ParamList"] | child
     ret_type: optional["RetTypeRepr"] | child
 
+class ForBinder(AstNode, ):
+    generic_param_list: optional["GenericParamList"] | child
+
 class ForExpr(Expr, ):
     attrs: list["Attr"] | child
     iterable: optional["Expr"] | child
@@ -273,7 +273,7 @@ class ForExpr(Expr, ):
     pat: optional["Pat"] | child
 
 class ForTypeRepr(TypeRepr, ):
-    generic_param_list: optional["GenericParamList"] | child
+    for_binder: optional["ForBinder"] | child
     type_repr: optional["TypeRepr"] | child
 
 class FormatArgsArg(AstNode, ):
@@ -399,10 +399,6 @@ class MacroRules(Item, ):
     token_tree: optional["TokenTree"] | child
     visibility: optional["Visibility"] | child
 
-class MacroBlockExpr(AstNode, ):
-    tail_expr: optional["Expr"] | child
-    statements: list["Stmt"] | child
-
 class MacroTypeRepr(TypeRepr, ):
     macro_call: optional["MacroCall"] | child
 
@@ -697,6 +693,7 @@ class TypeArg(GenericArg, ):
     type_repr: optional["TypeRepr"] | child
 
 class TypeBound(AstNode, ):
+    for_binder: optional["ForBinder"] | child
     is_async: predicate
     is_const: predicate
     lifetime: optional["Lifetime"] | child
@@ -757,7 +754,7 @@ class WhereClause(AstNode, ):
     predicates: list["WherePred"] | child
 
 class WherePred(AstNode, ):
-    generic_param_list: optional["GenericParamList"] | child
+    for_binder: optional["ForBinder"] | child
     lifetime: optional["Lifetime"] | child
     type_repr: optional["TypeRepr"] | child
     type_bound_list: optional["TypeBoundList"] | child
diff --git a/rust/schema/prelude.py b/rust/schema/prelude.py
index 62334b2d8641..0b1b57ea0896 100644
--- a/rust/schema/prelude.py
+++ b/rust/schema/prelude.py
@@ -82,24 +82,9 @@ class Addressable(AstNode):
 
     TODO: This does not yet include all possible cases.
     """
-    extended_canonical_path: optional[string] | desc("""
-        Either a canonical path (see https://doc.rust-lang.org/reference/paths.html#canonical-paths),
-        or `{<block id>}::name` for addressable items defined in an anonymous block (and only
-        addressable there-in).
-    """) | rust.detach | ql.internal
-    crate_origin: optional[string] | desc(
-        "One of `rustc:<name>`, `repo:<repository>:<name>` or `lang:<name>`.") | rust.detach | ql.internal
 
 
-class Resolvable(AstNode):
-    """
-    One of `PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat` or `MethodCallExpr`.
-    """
-    resolved_path: optional[string] | rust.detach | ql.internal
-    resolved_crate_origin: optional[string] | rust.detach | ql.internal
-
-
-class PathAstNode(Resolvable):
+class PathAstNode(AstNode):
     """
     An AST element wrapping a path (`PathExpr`, `RecordExpr`, `PathPat`, `RecordPat`, `TupleStructPat`).
     """
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index 6e48d91ef56c..88abeb21fd8c 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.4
+
+No user-facing changes.
+
 ## 0.0.3
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.4.md b/shared/concepts/change-notes/released/0.0.4.md
new file mode 100644
index 000000000000..eefe286a4d88
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.4.md
@@ -0,0 +1,3 @@
+## 0.0.4
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index a24b693d1e7a..ec411a674bcd 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.3
+lastReleaseVersion: 0.0.4
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index 1a4b23c6fcd3..bb5338db6d91 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.3
+version: 0.0.4
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index ecf7d7005e90..7e3580fae376 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.14
+
+No user-facing changes.
+
 ## 2.0.13
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.14.md b/shared/controlflow/change-notes/released/2.0.14.md
new file mode 100644
index 000000000000..13190ad53e34
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 30d169d6eb84..23aa0864b298 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.13
+lastReleaseVersion: 2.0.14
diff --git a/shared/controlflow/codeql/controlflow/BasicBlock.qll b/shared/controlflow/codeql/controlflow/BasicBlock.qll
index 132920e329fb..7aa541b46302 100644
--- a/shared/controlflow/codeql/controlflow/BasicBlock.qll
+++ b/shared/controlflow/codeql/controlflow/BasicBlock.qll
@@ -12,7 +12,11 @@ private import codeql.util.Location
 
 /** Provides the language-specific input specification. */
 signature module InputSig<LocationSig Location> {
-  class SuccessorType;
+  /** The type of a control flow successor. */
+  class SuccessorType {
+    /** Gets a textual representation of this successor type. */
+    string toString();
+  }
 
   /** Hold if `t` represents a conditional successor type. */
   predicate successorTypeIsCondition(SuccessorType t);
@@ -47,12 +51,137 @@ signature module InputSig<LocationSig Location> {
   predicate nodeIsPostDominanceExit(Node node);
 }
 
+signature module CfgSig<LocationSig Location> {
+  /** A control flow node. */
+  class ControlFlowNode {
+    /** Gets a textual representation of this control flow node. */
+    string toString();
+
+    /** Gets the location of this control flow node. */
+    Location getLocation();
+  }
+
+  /** The type of a control flow successor. */
+  class SuccessorType {
+    /** Gets a textual representation of this successor type. */
+    string toString();
+  }
+
+  /**
+   * A basic block, that is, a maximal straight-line sequence of control flow nodes
+   * without branches or joins.
+   */
+  class BasicBlock {
+    /** Gets a textual representation of this basic block. */
+    string toString();
+
+    /** Gets the location of this basic block. */
+    Location getLocation();
+
+    /** Gets the control flow node at a specific (zero-indexed) position in this basic block. */
+    ControlFlowNode getNode(int pos);
+
+    /** Gets the last control flow node in this basic block. */
+    ControlFlowNode getLastNode();
+
+    /** Gets the length of this basic block. */
+    int length();
+
+    /** Gets an immediate successor of this basic block, if any. */
+    BasicBlock getASuccessor();
+
+    /** Gets an immediate successor of this basic block of a given type, if any. */
+    BasicBlock getASuccessor(SuccessorType t);
+
+    /**
+     * Holds if this basic block strictly dominates basic block `bb`.
+     *
+     * That is, all paths reaching `bb` from the entry point basic block must
+     * go through this basic block and this basic block is different from `bb`.
+     */
+    predicate strictlyDominates(BasicBlock bb);
+
+    /**
+     * Holds if this basic block dominates basic block `bb`.
+     *
+     * That is, all paths reaching `bb` from the entry point basic block must
+     * go through this basic block.
+     */
+    predicate dominates(BasicBlock bb);
+
+    /**
+     * Holds if `df` is in the dominance frontier of this basic block. That is,
+     * this basic block dominates a predecessor of `df`, but does not dominate
+     * `df` itself. I.e., it is equivaluent to:
+     * ```
+     * this.dominates(df.getAPredecessor()) and not this.strictlyDominates(df)
+     * ```
+     */
+    predicate inDominanceFrontier(BasicBlock df);
+
+    /**
+     * Gets the basic block that immediately dominates this basic block, if any.
+     *
+     * That is, the result is the unique basic block satisfying:
+     * 1. The result strictly dominates this basic block.
+     * 2. There exists no other basic block that is strictly dominated by the
+     *    result and which strictly dominates this basic block.
+     *
+     * All basic blocks, except entry basic blocks, have a unique immediate
+     * dominator.
+     */
+    BasicBlock getImmediateDominator();
+
+    /**
+     * Holds if this basic block strictly post-dominates basic block `bb`.
+     *
+     * That is, all paths reaching a normal exit point basic block from basic
+     * block `bb` must go through this basic block and this basic block is
+     * different from `bb`.
+     */
+    predicate strictlyPostDominates(BasicBlock bb);
+
+    /**
+     * Holds if this basic block post-dominates basic block `bb`.
+     *
+     * That is, all paths reaching a normal exit point basic block from basic
+     * block `bb` must go through this basic block.
+     */
+    predicate postDominates(BasicBlock bb);
+  }
+
+  /**
+   * An entry basic block, that is, a basic block whose first node is
+   * an entry node.
+   */
+  class EntryBasicBlock extends BasicBlock;
+
+  /**
+   * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
+   * and `bb2` is a dominating edge.
+   *
+   * An edge `(bb1, bb2)` is dominating if there exists a basic block that can
+   * only be reached from the entry block by going through `(bb1, bb2)`. This
+   * implies that `(bb1, bb2)` dominates its endpoint `bb2`. I.e., `bb2` can
+   * only be reached from the entry block by going via `(bb1, bb2)`.
+   *
+   * This is a necessary and sufficient condition for an edge to dominate some
+   * block, and therefore `dominatingEdge(bb1, bb2) and bb2.dominates(bb3)`
+   * means that the edge `(bb1, bb2)` dominates `bb3`.
+   */
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2);
+}
+
 /**
  * Provides a basic block construction on top of a control flow graph.
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<LocationSig Location, InputSig<Location> Input> implements CfgSig<Location> {
   private import Input
 
+  class ControlFlowNode = Input::Node;
+
+  class SuccessorType = Input::SuccessorType;
+
   /**
    * A basic block, that is, a maximal straight-line sequence of control flow nodes
    * without branches or joins.
@@ -239,6 +368,10 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     string toString() { result = this.getFirstNode().toString() }
   }
 
+  class EntryBasicBlock extends BasicBlock {
+    EntryBasicBlock() { nodeIsDominanceEntry(this.getFirstNode()) }
+  }
+
   /**
    * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
    * and `bb2` is a dominating edge.
@@ -343,14 +476,14 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     cached
     Node getNode(BasicBlock bb, int pos) { bbIndex(bb.getFirstNode(), result, pos) }
 
-    /** Holds if `bb` is an entry basic block. */
-    private predicate entryBB(BasicBlock bb) { nodeIsDominanceEntry(bb.getFirstNode()) }
-
     cached
     predicate bbSuccessor(BasicBlock bb1, BasicBlock bb2, SuccessorType t) {
       bb2.getFirstNode() = nodeGetASuccessor(bb1.getLastNode(), t)
     }
 
+    /** Holds if `bb` is an entry basic block. */
+    private predicate entryBlock(EntryBasicBlock bb) { any() }
+
     /**
      * Holds if the first node of basic block `succ` is a control flow
      * successor of the last node of basic block `pred`.
@@ -360,7 +493,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /** Holds if `dom` is an immediate dominator of `bb`. */
     cached
     predicate bbIDominates(BasicBlock dom, BasicBlock bb) =
-      idominance(entryBB/1, succBB/2)(_, dom, bb)
+      idominance(entryBlock/1, succBB/2)(_, dom, bb)
 
     /** Holds if `pred` is a basic block predecessor of `succ`. */
     private predicate predBB(BasicBlock succ, BasicBlock pred) { succBB(pred, succ) }
diff --git a/shared/controlflow/codeql/controlflow/Cfg.qll b/shared/controlflow/codeql/controlflow/Cfg.qll
index 25796089ab50..6577a067175d 100644
--- a/shared/controlflow/codeql/controlflow/Cfg.qll
+++ b/shared/controlflow/codeql/controlflow/Cfg.qll
@@ -1609,7 +1609,7 @@ module MakeWithSplitting<
 
     private module BasicBlockImpl = BB::Make<Location, BasicBlockInputSig>;
 
-    final class BasicBlock = BasicBlockImpl::BasicBlock;
+    class BasicBlock = BasicBlockImpl::BasicBlock;
 
     predicate dominatingEdge = BasicBlockImpl::dominatingEdge/2;
 
diff --git a/shared/controlflow/codeql/controlflow/Guards.qll b/shared/controlflow/codeql/controlflow/Guards.qll
index ab500456058d..f39cb67b7e1a 100644
--- a/shared/controlflow/codeql/controlflow/Guards.qll
+++ b/shared/controlflow/codeql/controlflow/Guards.qll
@@ -50,16 +50,14 @@
 overlay[local?]
 module;
 
+private import codeql.controlflow.BasicBlock as BB
 private import codeql.util.Boolean
 private import codeql.util.Location
 private import codeql.util.Unit
 
-signature module InputSig<LocationSig Location> {
-  class SuccessorType {
-    /** Gets a textual representation of this successor type. */
-    string toString();
-  }
+signature class TypSig;
 
+signature module SuccessorTypesSig<TypSig SuccessorType> {
   class ExceptionSuccessor extends SuccessorType;
 
   class ConditionalSuccessor extends SuccessorType {
@@ -70,61 +68,12 @@ signature module InputSig<LocationSig Location> {
   class BooleanSuccessor extends ConditionalSuccessor;
 
   class NullnessSuccessor extends ConditionalSuccessor;
+}
 
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
-
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
-
+signature module InputSig<LocationSig Location, TypSig ControlFlowNode, TypSig BasicBlock> {
   /** A control flow node indicating normal termination of a callable. */
   class NormalExitNode extends ControlFlowNode;
 
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
-
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the last control flow node in this basic block. */
-    ControlFlowNode getLastNode();
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-
-    BasicBlock getASuccessor(SuccessorType t);
-
-    predicate dominates(BasicBlock bb);
-
-    predicate strictlyDominates(BasicBlock bb);
-  }
-
-  /**
-   * Holds if `bb1` has `bb2` as a direct successor and the edge between `bb1`
-   * and `bb2` is a dominating edge.
-   *
-   * An edge `(bb1, bb2)` is dominating if there exists a basic block that can
-   * only be reached from the entry block by going through `(bb1, bb2)`. This
-   * implies that `(bb1, bb2)` dominates its endpoint `bb2`. I.e., `bb2` can
-   * only be reached from the entry block by going via `(bb1, bb2)`.
-   *
-   * This is a necessary and sufficient condition for an edge to dominate some
-   * block, and therefore `dominatingEdge(bb1, bb2) and bb2.dominates(bb3)`
-   * means that the edge `(bb1, bb2)` dominates `bb3`.
-   */
-  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2);
-
   class AstNode {
     /** Gets a textual representation of this AST node. */
     string toString();
@@ -254,7 +203,15 @@ signature module InputSig<LocationSig Location> {
 }
 
 /** Provides guards-related predicates and classes. */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<
+  LocationSig Location, BB::CfgSig<Location> Cfg,
+  SuccessorTypesSig<Cfg::SuccessorType> SuccessorTypes,
+  InputSig<Location, Cfg::ControlFlowNode, Cfg::BasicBlock> Input>
+{
+  private module Cfg_ = Cfg;
+
+  private import Cfg_
+  private import SuccessorTypes
   private import Input
 
   private newtype TAbstractSingleValue =
@@ -873,77 +830,85 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
     private signature predicate baseGuardValueSig(Guard guard, GuardValue v);
 
-    /**
-     * Calculates the transitive closure of all the guard implication steps
-     * starting from a given set of base cases.
-     */
     cached
-    private module ImpliesTC<baseGuardValueSig/2 baseGuardValue> {
+    private module Cached {
       /**
-       * Holds if `tgtGuard` evaluating to `tgtVal` implies that `guard`
-       * evaluates to `v`.
+       * Calculates the transitive closure of all the guard implication steps
+       * starting from a given set of base cases.
        */
-      pragma[nomagic]
       cached
-      predicate guardControls(Guard guard, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
-        baseGuardValue(tgtGuard, tgtVal) and
-        guard = tgtGuard and
-        v = tgtVal
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          impliesStep2(g0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          unboundImpliesStep(g0, v0, guard, v)
-        )
-        or
-        exists(SsaDefinition def0, GuardValue v0 |
-          ssaControls(def0, v0, tgtGuard, tgtVal) and
-          impliesStepSsaGuard(def0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          WrapperGuard::wrapperImpliesStep(g0, v0, guard, v)
-        )
-        or
-        exists(Guard g0, GuardValue v0 |
-          guardControls(g0, v0, tgtGuard, tgtVal) and
-          additionalImpliesStep(g0, v0, guard, v)
-        )
+      module ImpliesTC<baseGuardValueSig/2 baseGuardValue> {
+        /**
+         * Holds if `tgtGuard` evaluating to `tgtVal` implies that `guard`
+         * evaluates to `v`.
+         */
+        pragma[nomagic]
+        cached
+        predicate guardControls(Guard guard, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
+          baseGuardValue(tgtGuard, tgtVal) and
+          guard = tgtGuard and
+          v = tgtVal
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            impliesStep2(g0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            unboundImpliesStep(g0, v0, guard, v)
+          )
+          or
+          exists(SsaDefinition def0, GuardValue v0 |
+            ssaControls(def0, v0, tgtGuard, tgtVal) and
+            impliesStepSsaGuard(def0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            WrapperGuard::wrapperImpliesStep(g0, v0, guard, v)
+          )
+          or
+          exists(Guard g0, GuardValue v0 |
+            guardControls(g0, v0, tgtGuard, tgtVal) and
+            additionalImpliesStep(g0, v0, guard, v)
+          )
+        }
+
+        /**
+         * Holds if `tgtGuard` evaluating to `tgtVal` implies that `def`
+         * evaluates to `v`.
+         */
+        pragma[nomagic]
+        cached
+        predicate ssaControls(SsaDefinition def, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
+          exists(Guard g0 |
+            guardControls(g0, v, tgtGuard, tgtVal) and
+            guardReadsSsaVar(g0, def)
+          )
+          or
+          exists(SsaDefinition def0 |
+            ssaControls(def0, v, tgtGuard, tgtVal) and
+            impliesStepSsa(def0, v, def)
+          )
+        }
       }
 
       /**
-       * Holds if `tgtGuard` evaluating to `tgtVal` implies that `def`
-       * evaluates to `v`.
+       * Holds if `guard` evaluating to `v` implies that `e` is guaranteed to be
+       * null if `isNull` is true, and non-null if `isNull` is false.
        */
-      pragma[nomagic]
       cached
-      predicate ssaControls(SsaDefinition def, GuardValue v, Guard tgtGuard, GuardValue tgtVal) {
-        exists(Guard g0 |
-          guardControls(g0, v, tgtGuard, tgtVal) and
-          guardReadsSsaVar(g0, def)
-        )
-        or
-        exists(SsaDefinition def0 |
-          ssaControls(def0, v, tgtGuard, tgtVal) and
-          impliesStepSsa(def0, v, def)
-        )
+      predicate nullGuard(Guard guard, GuardValue v, Expr e, boolean isNull) {
+        impliesStep2(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
+        WrapperGuard::wrapperImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
+        additionalImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull)))
       }
     }
 
-    /**
-     * Holds if `guard` evaluating to `v` implies that `e` is guaranteed to be
-     * null if `isNull` is true, and non-null if `isNull` is false.
-     */
-    predicate nullGuard(Guard guard, GuardValue v, Expr e, boolean isNull) {
-      impliesStep2(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
-      WrapperGuard::wrapperImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull))) or
-      additionalImpliesStep(guard, v, e, any(GuardValue gv | gv.isNullness(isNull)))
-    }
+    private import Cached
+
+    predicate nullGuard = Cached::nullGuard/4;
 
     private predicate hasAValueBranchEdge(Guard guard, GuardValue v) {
       guard.hasValueBranchEdge(_, _, v)
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 5dcd3a6170e4..09b18b15e93f 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.13
+version: 2.0.14
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index db415d30d47c..b5b86ffbccba 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.14
+
+No user-facing changes.
+
 ## 2.0.13
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.0.14.md b/shared/dataflow/change-notes/released/2.0.14.md
new file mode 100644
index 000000000000..13190ad53e34
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index 30d169d6eb84..23aa0864b298 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.13
+lastReleaseVersion: 2.0.14
diff --git a/shared/dataflow/codeql/dataflow/VariableCapture.qll b/shared/dataflow/codeql/dataflow/VariableCapture.qll
index 922391221a40..0ba44be5ea1f 100644
--- a/shared/dataflow/codeql/dataflow/VariableCapture.qll
+++ b/shared/dataflow/codeql/dataflow/VariableCapture.qll
@@ -8,66 +8,14 @@ module;
 private import codeql.util.Boolean
 private import codeql.util.Unit
 private import codeql.util.Location
+private import codeql.controlflow.BasicBlock as BB
 private import codeql.ssa.Ssa as Ssa
 
-signature module InputSig<LocationSig Location> {
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
-
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the enclosing callable. */
-    Callable getEnclosingCallable();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-  }
-
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
+signature class BasicBlockSig;
 
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
-
-  /**
-   * Gets the basic block that immediately dominates basic block `bb`, if any.
-   *
-   * That is, all paths reaching `bb` from some entry point basic block must go
-   * through the result.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s) {
-   *   if (s == null)
-   *     throw new ArgumentNullException(nameof(s));
-   *   return s.Length;
-   * }
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 4 (all paths from the entry point of `M`
-   * to `return s.Length;` must go through the null check.
-   */
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb);
-
-  /** Gets an immediate successor of basic block `bb`, if any. */
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb);
-
-  /** Holds if `bb` is a control-flow entry point. */
-  default predicate entryBlock(BasicBlock bb) { not exists(getImmediateBasicBlockDominator(bb)) }
+signature module InputSig<LocationSig Location, BasicBlockSig BasicBlock> {
+  /** Gets the enclosing callable of the basic block. */
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb);
 
   /** A variable that is captured in a closure. */
   class CapturedVariable {
@@ -153,7 +101,9 @@ signature module InputSig<LocationSig Location> {
   }
 }
 
-signature module OutputSig<LocationSig Location, InputSig<Location> I> {
+signature module OutputSig<
+  LocationSig Location, BasicBlockSig BasicBlock, InputSig<Location, BasicBlock> I>
+{
   /**
    * A data flow node that we need to reference in the step relations for
    * captured variables.
@@ -255,9 +205,18 @@ signature module OutputSig<LocationSig Location, InputSig<Location> I> {
  * Constructs the type `ClosureNode` and associated step relations, which are
  * intended to be included in the data-flow node and step relations.
  */
-module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig<Location, Input> {
+module Flow<
+  LocationSig Location, BB::CfgSig<Location> Cfg, InputSig<Location, Cfg::BasicBlock> Input>
+  implements OutputSig<Location, Cfg::BasicBlock, Input>
+{
   private import Input
 
+  final private class CfgBb = Cfg::BasicBlock;
+
+  private class BasicBlock extends CfgBb {
+    Callable getEnclosingCallable() { result = basicBlockGetEnclosingCallable(this) }
+  }
+
   additional module ConsistencyChecks {
     final private class FinalExpr = Expr;
 
@@ -332,17 +291,17 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
 
     query predicate uniqueDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has multiple immediate dominators" and
-      2 <= strictcount(getImmediateBasicBlockDominator(bb))
+      2 <= strictcount(bb.getImmediateDominator())
     }
 
     query predicate localDominator(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local dominator" and
-      bb.getEnclosingCallable() != getImmediateBasicBlockDominator(bb).getEnclosingCallable()
+      bb.getEnclosingCallable() != bb.getImmediateDominator().(BasicBlock).getEnclosingCallable()
     }
 
     query predicate localSuccessor(RelevantBasicBlock bb, string msg) {
       msg = "BasicBlock has non-local successor" and
-      bb.getEnclosingCallable() != getABasicBlockSuccessor(bb).getEnclosingCallable()
+      bb.getEnclosingCallable() != bb.getASuccessor().(BasicBlock).getEnclosingCallable()
     }
 
     query predicate uniqueDefiningScope(CapturedVariable v, string msg) {
@@ -669,7 +628,7 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
   /** Holds if `cc` needs a definition at the entry of its callable scope. */
   private predicate entryDef(CaptureContainer cc, BasicBlock bb, int i) {
     exists(Callable c |
-      entryBlock(bb) and
+      bb instanceof Cfg::EntryBasicBlock and
       pragma[only_bind_out](bb.getEnclosingCallable()) = c and
       i =
         min(int j |
@@ -685,22 +644,10 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
     )
   }
 
-  private module CaptureSsaInput implements Ssa::InputSig<Location> {
-    final class BasicBlock = Input::BasicBlock;
-
-    final class ControlFlowNode = Input::ControlFlowNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = Input::getImmediateBasicBlockDominator(bb)
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) {
-      result = Input::getABasicBlockSuccessor(bb)
-    }
-
+  private module CaptureSsaInput implements Ssa::InputSig<Location, Cfg::BasicBlock> {
     class SourceVariable = CaptureContainer;
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable cc, boolean certain) {
+    predicate variableWrite(Cfg::BasicBlock bb, int i, SourceVariable cc, boolean certain) {
       Cached::ref() and
       (
         exists(CapturedVariable v | cc = TVariable(v) and captureWrite(v, bb, i, true, _))
@@ -710,9 +657,9 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
       certain = true
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable cc, boolean certain) {
+    predicate variableRead(Cfg::BasicBlock bb, int i, SourceVariable cc, boolean certain) {
       (
-        synthThisQualifier(bb, i) and cc = TThis(bb.getEnclosingCallable())
+        synthThisQualifier(bb, i) and cc = TThis(bb.(BasicBlock).getEnclosingCallable())
         or
         exists(CapturedVariable v | cc = TVariable(v) |
           captureRead(v, bb, i, true, _) or synthRead(v, bb, i, true, _)
@@ -722,26 +669,30 @@ module Flow<LocationSig Location, InputSig<Location> Input> implements OutputSig
     }
   }
 
-  private module CaptureSsa = Ssa::Make<Location, CaptureSsaInput>;
+  private module CaptureSsa = Ssa::Make<Location, Cfg, CaptureSsaInput>;
 
   private module DataFlowIntegrationInput implements CaptureSsa::DataFlowIntegrationInputSig {
     private import codeql.util.Void
 
-    class Expr instanceof Input::ControlFlowNode {
+    class Expr instanceof Cfg::ControlFlowNode {
       string toString() { result = super.toString() }
 
-      predicate hasCfgNode(BasicBlock bb, int i) { bb.getNode(i) = this }
+      predicate hasCfgNode(Cfg::BasicBlock bb, int i) { bb.getNode(i) = this }
     }
 
     class GuardValue = Void;
 
     class Guard extends Void {
-      predicate hasValueBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+      predicate hasValueBranchEdge(Cfg::BasicBlock bb1, Cfg::BasicBlock bb2, GuardValue val) {
+        none()
+      }
 
-      predicate valueControlsBranchEdge(BasicBlock bb1, BasicBlock bb2, GuardValue val) { none() }
+      predicate valueControlsBranchEdge(Cfg::BasicBlock bb1, Cfg::BasicBlock bb2, GuardValue val) {
+        none()
+      }
     }
 
-    predicate guardDirectlyControlsBlock(Guard guard, BasicBlock bb, GuardValue val) { none() }
+    predicate guardDirectlyControlsBlock(Guard guard, Cfg::BasicBlock bb, GuardValue val) { none() }
 
     predicate includeWriteDefsInFlowStep() { none() }
 
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index a3b226664228..d0a78e01e0a9 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,8 +1,9 @@
 name: codeql/dataflow
-version: 2.0.13
+version: 2.0.14
 groups: shared
 library: true
 dependencies:
+  codeql/controlflow: ${workspace}
   codeql/ssa: ${workspace}
   codeql/typetracking: ${workspace}
   codeql/util: ${workspace}
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 6bd67795a3a0..bd3e670038ce 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.30.md b/shared/mad/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index b8dbf57a2994..bd421a6ebb88 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index 8f58f5145db5..fba2a8703562 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.8
+
+No user-facing changes.
+
 ## 0.0.7
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.8.md b/shared/quantum/change-notes/released/0.0.8.md
new file mode 100644
index 000000000000..6af2d954c099
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.8.md
@@ -0,0 +1,3 @@
+## 0.0.8
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index a2a5484910bc..58fdc6b45deb 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.7
+lastReleaseVersion: 0.0.8
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index ea2acfb14f67..220edda5d931 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.7
+version: 0.0.8
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index c6dd1d9b79de..e64dff3b1e69 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.30.md b/shared/rangeanalysis/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index 833e16de4d21..56f2327b4bfd 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index ccbf4d95cf61..11353af62b14 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.30.md b/shared/regex/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index a3195cfb3d01..0e81cc29880b 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 9c9caa32918c..5a9cf1a7175a 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.6
+
+No user-facing changes.
+
 ## 2.0.5
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.6.md b/shared/ssa/change-notes/released/2.0.6.md
new file mode 100644
index 000000000000..d8ae25aacd0f
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.6.md
@@ -0,0 +1,3 @@
+## 2.0.6
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index 6c269316f278..fbbc03c76427 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.5
+lastReleaseVersion: 2.0.6
diff --git a/shared/ssa/codeql/ssa/Ssa.qll b/shared/ssa/codeql/ssa/Ssa.qll
index 2aa136ff7197..20a447f91a99 100644
--- a/shared/ssa/codeql/ssa/Ssa.qll
+++ b/shared/ssa/codeql/ssa/Ssa.qll
@@ -5,63 +5,14 @@
 overlay[local?]
 module;
 
+private import codeql.controlflow.BasicBlock as BB
 private import codeql.util.Location
 private import codeql.util.Unit
 
-/** Provides the input specification of the SSA implementation. */
-signature module InputSig<LocationSig Location> {
-  /**
-   * A basic block, that is, a maximal straight-line sequence of control flow nodes
-   * without branches or joins.
-   */
-  class BasicBlock {
-    /** Gets a textual representation of this basic block. */
-    string toString();
-
-    /** Gets the `i`th node in this basic block. */
-    ControlFlowNode getNode(int i);
-
-    /** Gets the length of this basic block. */
-    int length();
-
-    /** Gets the location of this basic block. */
-    Location getLocation();
-  }
-
-  /** A control flow node. */
-  class ControlFlowNode {
-    /** Gets a textual representation of this control flow node. */
-    string toString();
-
-    /** Gets the location of this control flow node. */
-    Location getLocation();
-  }
-
-  /**
-   * Gets the basic block that immediately dominates basic block `bb`, if any.
-   *
-   * That is, all paths reaching `bb` from some entry point basic block must go
-   * through the result.
-   *
-   * Example:
-   *
-   * ```csharp
-   * int M(string s) {
-   *   if (s == null)
-   *     throw new ArgumentNullException(nameof(s));
-   *   return s.Length;
-   * }
-   * ```
-   *
-   * The basic block starting on line 2 is an immediate dominator of
-   * the basic block on line 4 (all paths from the entry point of `M`
-   * to `return s.Length;` must go through the null check.
-   */
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb);
-
-  /** Gets an immediate successor of basic block `bb`, if any. */
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb);
+signature class BasicBlockSig;
 
+/** Provides the input specification of the SSA implementation. */
+signature module InputSig<LocationSig Location, BasicBlockSig BasicBlock> {
   /** A variable that can be SSA converted. */
   class SourceVariable {
     /** Gets a textual representation of this variable. */
@@ -108,12 +59,13 @@ signature module InputSig<LocationSig Location> {
  * NB: If this predicate is exposed, it should be cached.
  * ```
  */
-module Make<LocationSig Location, InputSig<Location> Input> {
+module Make<
+  LocationSig Location, BB::CfgSig<Location> Cfg, InputSig<Location, Cfg::BasicBlock> Input>
+{
+  private import Cfg
   private import Input
 
-  private BasicBlock getABasicBlockPredecessor(BasicBlock bb) {
-    getABasicBlockSuccessor(result) = bb
-  }
+  private BasicBlock getABasicBlockPredecessor(BasicBlock bb) { result.getASuccessor() = bb }
 
   /**
    * A classification of variable references into reads and
@@ -237,9 +189,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     /**
      * Holds if source variable `v` is live at the end of basic block `bb`.
      */
-    predicate liveAtExit(BasicBlock bb, SourceVariable v) {
-      liveAtEntry(getABasicBlockSuccessor(bb), v)
-    }
+    predicate liveAtExit(BasicBlock bb, SourceVariable v) { liveAtEntry(bb.getASuccessor(), v) }
 
     /**
      * Holds if variable `v` is live in basic block `bb` at rank `rnk`.
@@ -270,25 +220,6 @@ module Make<LocationSig Location, InputSig<Location> Input> {
 
   private import Liveness
 
-  /**
-   * Holds if `df` is in the dominance frontier of `bb`.
-   *
-   * This is equivalent to:
-   *
-   * ```ql
-   * bb = getImmediateBasicBlockDominator*(getABasicBlockPredecessor(df)) and
-   * not bb = getImmediateBasicBlockDominator+(df)
-   * ```
-   */
-  private predicate inDominanceFrontier(BasicBlock bb, BasicBlock df) {
-    bb = getABasicBlockPredecessor(df) and not bb = getImmediateBasicBlockDominator(df)
-    or
-    exists(BasicBlock prev | inDominanceFrontier(prev, df) |
-      bb = getImmediateBasicBlockDominator(prev) and
-      not bb = getImmediateBasicBlockDominator(df)
-    )
-  }
-
   /**
    * Holds if `bb` is in the dominance frontier of a block containing a
    * definition of `v`.
@@ -297,7 +228,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   private predicate inDefDominanceFrontier(BasicBlock bb, SourceVariable v) {
     exists(BasicBlock defbb, Definition def |
       def.definesAt(v, defbb, _) and
-      inDominanceFrontier(defbb, bb)
+      defbb.inDominanceFrontier(bb)
     )
   }
 
@@ -307,7 +238,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
    */
   pragma[nomagic]
   private predicate inReadDominanceFrontier(BasicBlock bb, SourceVariable v) {
-    exists(BasicBlock readbb | inDominanceFrontier(readbb, bb) |
+    exists(BasicBlock readbb | readbb.inDominanceFrontier(bb) |
       ssaDefReachesRead(v, _, readbb, _) and
       variableRead(readbb, _, v, true) and
       not variableWrite(readbb, _, v, _)
@@ -389,7 +320,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     pragma[nomagic]
     private predicate liveThrough(BasicBlock idom, BasicBlock bb, SourceVariable v) {
-      idom = getImmediateBasicBlockDominator(bb) and
+      idom = bb.getImmediateDominator() and
       liveAtExit(bb, v) and
       not any(Definition def).definesAt(v, bb, _)
     }
@@ -439,7 +370,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       ssaDefReachesReadWithinBlock(v, def, bb, i)
       or
       ssaRef(bb, i, v, Read()) and
-      ssaDefReachesEndOfBlock(getImmediateBasicBlockDominator(bb), def, v) and
+      ssaDefReachesEndOfBlock(bb.getImmediateDominator(), def, v) and
       not ssaDefReachesReadWithinBlock(v, _, bb, i)
     }
 
@@ -483,7 +414,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
      */
     pragma[nomagic]
     private predicate liveThrough(BasicBlock idom, BasicBlock bb, SourceVariable v) {
-      idom = getImmediateBasicBlockDominator(bb) and
+      idom = bb.getImmediateDominator() and
       liveAtExit(bb, v) and
       not ssaRef(bb, _, v, _)
     }
@@ -517,7 +448,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       bb1 = bb2 and
       refRank(bb1, i1, v, _) + 1 = refRank(bb2, i2, v, Read())
       or
-      refReachesEndOfBlock(bb1, i1, getImmediateBasicBlockDominator(bb2), v) and
+      refReachesEndOfBlock(bb1, i1, bb2.getImmediateDominator(), v) and
       1 = refRank(bb2, i2, v, Read())
     }
 
@@ -808,12 +739,12 @@ module Make<LocationSig Location, InputSig<Location> Input> {
       DefinitionExt def, SourceVariable v, BasicBlock bb1, BasicBlock bb2
     ) {
       defOccursInBlock(def, bb1, v, _) and
-      bb2 = getABasicBlockSuccessor(bb1)
+      bb2 = bb1.getASuccessor()
       or
       exists(BasicBlock mid |
         varBlockReachesExt(def, v, bb1, mid) and
         ssaDefReachesThroughBlock(def, mid) and
-        bb2 = getABasicBlockSuccessor(mid)
+        bb2 = mid.getASuccessor()
       )
     }
 
@@ -943,7 +874,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
     // the node. If two definitions dominate a node then one must dominate the
     // other, so therefore the definition of _closest_ is given by the dominator
     // tree. Thus, reaching definitions can be calculated in terms of dominance.
-    ssaDefReachesEndOfBlockExt0(getImmediateBasicBlockDominator(bb), def, pragma[only_bind_into](v)) and
+    ssaDefReachesEndOfBlockExt0(bb.getImmediateDominator(), def, pragma[only_bind_into](v)) and
     liveThroughExt(bb, pragma[only_bind_into](v))
   }
 
@@ -1150,7 +1081,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
   predicate uncertainWriteDefinitionInput = SsaDefReachesNew::uncertainWriteDefinitionInput/2;
 
   /** Holds if `bb` is a control-flow exit point. */
-  private predicate exitBlock(BasicBlock bb) { not exists(getABasicBlockSuccessor(bb)) }
+  private predicate exitBlock(BasicBlock bb) { not exists(bb.getASuccessor()) }
 
   /**
    * NB: If this predicate is exposed, it should be cached.
@@ -1418,7 +1349,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         or
         ssaDefReachesRead(v, def, bb, i) and
         not SsaDefReachesNew::ssaDefReachesReadWithinBlock(v, def, bb, i) and
-        not def.definesAt(v, getImmediateBasicBlockDominator*(bb), _)
+        not def.definesAt(v, bb.getImmediateDominator*(), _)
       )
     }
 
@@ -1667,7 +1598,7 @@ module Make<LocationSig Location, InputSig<Location> Input> {
         DfInput::keepAllPhiInputBackEdges() and
         exists(getAPhiInputDef(phi, input)) and
         phi.getBasicBlock() = bbPhi and
-        getImmediateBasicBlockDominator+(input) = bbPhi
+        input.getImmediateDominator+() = bbPhi
       )
     }
 
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 8eef08c4cb4a..905456d7859f 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,7 +1,8 @@
 name: codeql/ssa
-version: 2.0.5
+version: 2.0.6
 groups: shared
 library: true
 dependencies:
+  codeql/controlflow: ${workspace}
   codeql/util: ${workspace}
 warnOnImplicitThis: true
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index 596a873b2c52..c30f8de8bc9b 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.30.md b/shared/threat-models/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 4e74fe0abde2..3bb1891658d2 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.29
+version: 1.0.30
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tree-sitter-extractor/Cargo.toml b/shared/tree-sitter-extractor/Cargo.toml
index 4cfeae2801b0..e47ef3577e24 100644
--- a/shared/tree-sitter-extractor/Cargo.toml
+++ b/shared/tree-sitter-extractor/Cargo.toml
@@ -24,4 +24,4 @@ zstd = "0.13.3"
 [dev-dependencies]
 tree-sitter-ql = "0.23.1"
 tree-sitter-json = "0.24.8"
-rand = "0.9.1"
+rand = "0.9.2"
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 73e105010410..61441b610612 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.30.md b/shared/tutorial/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 263d7bdf3a8e..7c3ec5193c35 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.29
+version: 1.0.30
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index 5b8d81ca4b30..94df766d756c 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.30.md b/shared/typeflow/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 98c82501a978..f4912ea54902 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index 1857b399fe88..d9dd6b6f2e25 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.11
+
+No user-facing changes.
+
 ## 0.0.10
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.11.md b/shared/typeinference/change-notes/released/0.0.11.md
new file mode 100644
index 000000000000..19a2a55bd685
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.11.md
@@ -0,0 +1,3 @@
+## 0.0.11
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index b740014e5aed..e679dc420925 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.10
+lastReleaseVersion: 0.0.11
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index c42a424f3e34..32615dc46cd6 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -731,20 +731,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         IsInstantiationOfInputSig<TypeMentionTypeTree>
       {
         pragma[nomagic]
-        private predicate typeCondition(Type type, TypeAbstraction abs, TypeMentionTypeTree lhs) {
-          conditionSatisfiesConstraint(abs, lhs, _) and type = resolveTypeMentionRoot(lhs)
+        private predicate typeCondition(
+          Type type, TypeAbstraction abs, TypeMentionTypeTree condition
+        ) {
+          conditionSatisfiesConstraint(abs, condition, _) and
+          type = resolveTypeMentionRoot(condition)
         }
 
         pragma[nomagic]
-        private predicate typeConstraint(Type type, TypeMentionTypeTree rhs) {
-          conditionSatisfiesConstraint(_, _, rhs) and type = resolveTypeMentionRoot(rhs)
+        private predicate typeConstraint(Type type, TypeMentionTypeTree constraint) {
+          conditionSatisfiesConstraint(_, _, constraint) and
+          type = resolveTypeMentionRoot(constraint)
         }
 
         predicate potentialInstantiationOf(
-          TypeMentionTypeTree condition, TypeAbstraction abs, TypeMention constraint
+          TypeMentionTypeTree constraint, TypeAbstraction abs, TypeMention condition
         ) {
           exists(Type type |
-            typeConstraint(type, condition) and typeCondition(type, abs, constraint)
+            typeConstraint(type, constraint) and typeCondition(type, abs, condition)
           )
         }
       }
@@ -761,20 +765,20 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         constraint.resolveTypeAt(path) = t
         or
         // recursive case
-        exists(TypeAbstraction midAbs, TypeMention midSup, TypeMention midSub |
-          conditionSatisfiesConstraint(abs, condition, midSup) and
-          // NOTE: `midAbs` describe the free type variables in `midSub`, hence
+        exists(TypeAbstraction midAbs, TypeMention midConstraint, TypeMention midCondition |
+          conditionSatisfiesConstraint(abs, condition, midConstraint) and
+          // NOTE: `midAbs` describe the free type variables in `midCondition`, hence
           // we use that for instantiation check.
-          IsInstantiationOf<TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(midSup,
-            midAbs, midSub)
+          IsInstantiationOf<TypeMentionTypeTree, IsInstantiationOfInput>::isInstantiationOf(midConstraint,
+            midAbs, midCondition)
         |
-          conditionSatisfiesConstraintTypeAt(midAbs, midSub, constraint, path, t) and
+          conditionSatisfiesConstraintTypeAt(midAbs, midCondition, constraint, path, t) and
           not t = midAbs.getATypeParameter()
           or
           exists(TypePath prefix, TypePath suffix, TypeParameter tp |
             tp = midAbs.getATypeParameter() and
-            conditionSatisfiesConstraintTypeAt(midAbs, midSub, constraint, prefix, tp) and
-            instantiatesWith(midSup, midSub, tp, suffix, t) and
+            conditionSatisfiesConstraintTypeAt(midAbs, midCondition, constraint, prefix, tp) and
+            instantiatesWith(midConstraint, midCondition, tp, suffix, t) and
             path = prefix.append(suffix)
           )
         )
@@ -949,23 +953,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
        */
       pragma[nomagic]
       private predicate hasConstraintMention(
-        HasTypeTree tt, TypeAbstraction abs, TypeMention sub, Type constraint,
+        HasTypeTree tt, TypeAbstraction abs, TypeMention condition, Type constraint,
         TypeMention constraintMention
       ) {
         exists(Type type | hasTypeConstraint(tt, type, constraint) |
           not exists(countConstraintImplementations(type, constraint)) and
-          conditionSatisfiesConstraintTypeAt(abs, sub, constraintMention, _, _) and
-          resolveTypeMentionRoot(sub) = abs.getATypeParameter() and
+          conditionSatisfiesConstraintTypeAt(abs, condition, constraintMention, _, _) and
+          resolveTypeMentionRoot(condition) = abs.getATypeParameter() and
           constraint = resolveTypeMentionRoot(constraintMention)
           or
           countConstraintImplementations(type, constraint) > 0 and
-          rootTypesSatisfaction(type, constraint, abs, sub, constraintMention) and
+          rootTypesSatisfaction(type, constraint, abs, condition, constraintMention) and
           // When there are multiple ways the type could implement the
           // constraint we need to find the right implementation, which is the
           // one where the type instantiates the precondition.
           if multipleConstraintImplementations(type, constraint)
           then
-            IsInstantiationOf<HasTypeTree, IsInstantiationOfInput>::isInstantiationOf(tt, abs, sub)
+            IsInstantiationOf<HasTypeTree, IsInstantiationOfInput>::isInstantiationOf(tt, abs,
+              condition)
           else any()
         )
       }
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index f4aba2b768e4..896a509a85b8 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.10
+version: 0.0.11
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index 7e63a18be0bf..4e7d55fc700a 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.14
+
+No user-facing changes.
+
 ## 2.0.13
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.14.md b/shared/typetracking/change-notes/released/2.0.14.md
new file mode 100644
index 000000000000..13190ad53e34
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.14.md
@@ -0,0 +1,3 @@
+## 2.0.14
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 30d169d6eb84..23aa0864b298 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.13
+lastReleaseVersion: 2.0.14
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index b25743112e18..8086557d787f 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.13
+version: 2.0.14
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 4c15b434d52a..37548ac47d54 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.30.md b/shared/typos/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index ed8c5320fdbc..c15c298051f9 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index f7354c0cfbe3..193ce4e9521b 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 2.0.17
+
+### Minor Analysis Improvements
+
+* Added `LocatableOption` and `OptionWithLocationInfo` as modules providing option types with location information.
+
 ## 2.0.16
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.17.md b/shared/util/change-notes/released/2.0.17.md
new file mode 100644
index 000000000000..e7a8146ddd0e
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.17.md
@@ -0,0 +1,5 @@
+## 2.0.17
+
+### Minor Analysis Improvements
+
+* Added `LocatableOption` and `OptionWithLocationInfo` as modules providing option types with location information.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index c10461a785cf..a5f7c15c020f 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.16
+lastReleaseVersion: 2.0.17
diff --git a/shared/util/codeql/util/Option.qll b/shared/util/codeql/util/Option.qll
index 65a5e8724526..77cc89504f58 100644
--- a/shared/util/codeql/util/Option.qll
+++ b/shared/util/codeql/util/Option.qll
@@ -2,12 +2,24 @@
 overlay[local?]
 module;
 
+private import Location
+
 /** A type with `toString`. */
 private signature class TypeWithToString {
   bindingset[this]
   string toString();
 }
 
+/** A type with `toString` and `hasLocationInfo` */
+private signature class TypeWithLocationInfo {
+  bindingset[this]
+  string toString();
+
+  predicate hasLocationInfo(
+    string filePath, int startLine, int startColumn, int endLine, int endColumn
+  );
+}
+
 /**
  * Constructs an `Option` type that is a disjoint union of the given type and an
  * additional singleton element.
@@ -45,3 +57,91 @@ module Option<TypeWithToString T> {
   /** Gets the given element wrapped as an `Option`. */
   Some some(T c) { result = TSome(c) }
 }
+
+/**
+ * Constructs an `Option` type that is a disjoint union of the given type and an
+ * additional singleton element, and has a `hasLocationInfo` predicate.
+ * `T` must have a `hasLocationInfo` predicate.
+ */
+module OptionWithLocationInfo<TypeWithLocationInfo T> {
+  private module O = Option<T>;
+
+  final private class BaseOption = O::Option;
+
+  /**
+   * An option type. This is either a singleton `None` or a `Some` wrapping the
+   * given type.
+   */
+  class Option extends BaseOption {
+    /**
+     * Holds if this element is at the specified location.
+     * The location spans column `startColumn` of line `startLine` to
+     * column `endColumn` of line `endLine` in file `filepath`.
+     * For more information, see
+     * [Providing locations in CodeQL queries](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+     */
+    predicate hasLocationInfo(
+      string filePath, int startLine, int startColumn, int endLine, int endColumn
+    ) {
+      this.isNone() and
+      filePath = "" and
+      startLine = 0 and
+      startColumn = 0 and
+      endLine = 0 and
+      endColumn = 0
+      or
+      this.asSome().hasLocationInfo(filePath, startLine, startColumn, endLine, endColumn)
+    }
+  }
+
+  /** The singleton `None` element. */
+  class None extends Option instanceof O::None { }
+
+  /** A wrapper for the given type. */
+  class Some extends Option instanceof O::Some { }
+
+  /** Gets the given element wrapped as an `Option`. */
+  Some some(T c) { result.asSome() = c }
+}
+
+private module WithLocation<LocationSig Location> {
+  signature class LocatableType {
+    bindingset[this]
+    string toString();
+
+    Location getLocation();
+  }
+}
+
+/**
+ * Constructs an `Option` type that is a disjoint union of the given type and an
+ * additional singleton element, and has a `getLocation` predicate.
+ * `T` must have a `getLocation` predicate with a result type of `Location`.
+ */
+module LocatableOption<LocationSig Location, WithLocation<Location>::LocatableType T> {
+  private module O = Option<T>;
+
+  final private class BaseOption = O::Option;
+
+  /**
+   * An option type. This is either a singleton `None` or a `Some` wrapping the
+   * given type.
+   */
+  class Option extends BaseOption {
+    Location getLocation() {
+      result = this.asSome().getLocation()
+      or
+      this.isNone() and
+      result.hasLocationInfo("", 0, 0, 0, 0)
+    }
+  }
+
+  /** The singleton `None` element. */
+  class None extends Option instanceof O::None { }
+
+  /** A wrapper for the given type. */
+  class Some extends Option instanceof O::Some { }
+
+  /** Gets the given element wrapped as an `Option`. */
+  Some some(T c) { result.asSome() = c }
+}
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index be3bcefeac00..79dc89b3d4bb 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.16
+version: 2.0.17
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 70c943269709..962044915369 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.30.md b/shared/xml/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 23aa3f361b22..c6ad5ad9d2ad 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index e0f14b7a34c3..67e07b084672 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.30
+
+No user-facing changes.
+
 ## 1.0.29
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.30.md b/shared/yaml/change-notes/released/1.0.30.md
new file mode 100644
index 000000000000..cb2cf6d0a27d
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.30.md
@@ -0,0 +1,3 @@
+## 1.0.30
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 8751a2162388..f04640951dec 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.29
+lastReleaseVersion: 1.0.30
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 366255af6f21..8588e1f0c6a1 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.29
+version: 1.0.30
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/codeql-extractor.yml b/swift/codeql-extractor.yml
index c7c0bdca75aa..589679cdb0ea 100644
--- a/swift/codeql-extractor.yml
+++ b/swift/codeql-extractor.yml
@@ -6,6 +6,8 @@ legacy_qltest_extraction: true
 build_modes:
   - autobuild
   - manual
+default_queries:
+  - codeql/swift-queries
 github_api_languages:
   - Swift
 scc_languages:
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index 13c6f27bffbb..cef716a25783 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.0.6
+
+No user-facing changes.
+
 ## 5.0.5
 
 No user-facing changes.
diff --git a/swift/ql/lib/Customizations.qll b/swift/ql/lib/Customizations.qll
new file mode 100644
index 000000000000..bf9e66de70b8
--- /dev/null
+++ b/swift/ql/lib/Customizations.qll
@@ -0,0 +1,11 @@
+/**
+ * Contains customizations to the standard library.
+ *
+ * This module is imported by `swift.qll`, so any customizations defined here automatically
+ * apply to all queries.
+ *
+ * Typical examples of customizations include adding new subclasses of abstract classes such as
+ * the `RemoteFlowSource` class to model frameworks that are not covered by the standard library.
+ */
+
+import swift
diff --git a/swift/ql/lib/change-notes/released/5.0.6.md b/swift/ql/lib/change-notes/released/5.0.6.md
new file mode 100644
index 000000000000..3281a876281d
--- /dev/null
+++ b/swift/ql/lib/change-notes/released/5.0.6.md
@@ -0,0 +1,3 @@
+## 5.0.6
+
+No user-facing changes.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 02e5f00fa9e4..cc6fded2554d 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.0.5
+lastReleaseVersion: 5.0.6
diff --git a/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll b/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
index 160903fd8954..b6ac7144ac4e 100644
--- a/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
+++ b/swift/ql/lib/codeql/swift/controlflow/BasicBlocks.qll
@@ -1,9 +1,11 @@
 /** Provides classes representing basic blocks. */
 
+private import swift
 private import ControlFlowGraph
 private import internal.ControlFlowGraphImpl as CfgImpl
 private import SuccessorTypes
 private import CfgImpl::BasicBlocks as BasicBlocksImpl
+private import codeql.controlflow.BasicBlock as BB
 
 /**
  * A basic block, that is, a maximal straight-line sequence of control flow nodes
@@ -111,3 +113,25 @@ final class ConditionBlock extends BasicBlock, BasicBlocksImpl::ConditionBasicBl
     super.edgeDominates(controlled, s)
   }
 }
+
+private class BasicBlockAlias = BasicBlock;
+
+private class EntryBasicBlockAlias = EntryBasicBlock;
+
+private class ControlFlowNodeAlias = ControlFlowNode;
+
+private class SuccessorTypeAlias = SuccessorType;
+
+module Cfg implements BB::CfgSig<Location> {
+  class ControlFlowNode = ControlFlowNodeAlias;
+
+  class SuccessorType = SuccessorTypeAlias;
+
+  class BasicBlock = BasicBlockAlias;
+
+  class EntryBasicBlock = EntryBasicBlockAlias;
+
+  predicate dominatingEdge(BasicBlock bb1, BasicBlock bb2) {
+    BasicBlocksImpl::dominatingEdge(bb1, bb2)
+  }
+}
diff --git a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
index ed75a06e5349..4f0754ff5900 100644
--- a/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/Ssa.qll
@@ -6,21 +6,10 @@ module Ssa {
   private import codeql.swift.controlflow.ControlFlowGraph
   private import codeql.swift.controlflow.BasicBlocks as BasicBlocks
 
-  private module SsaInput implements SsaImplCommon::InputSig<Location> {
+  private module SsaInput implements SsaImplCommon::InputSig<Location, BasicBlocks::BasicBlock> {
     private import internal.DataFlowPrivate
-    private import codeql.swift.controlflow.ControlFlowGraph as Cfg
     private import codeql.swift.controlflow.CfgNodes
 
-    class BasicBlock = BasicBlocks::BasicBlock;
-
-    class ControlFlowNode = Cfg::ControlFlowNode;
-
-    BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-      result = bb.getImmediateDominator()
-    }
-
-    BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.getASuccessor() }
-
     private newtype TSourceVariable =
       TNormalSourceVariable(VarDecl v) or
       TKeyPathSourceVariable(EntryNode entry) { entry.getScope() instanceof KeyPathExpr }
@@ -61,7 +50,7 @@ module Ssa {
       override EntryNode asKeyPath() { result = enter }
     }
 
-    predicate variableWrite(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableWrite(BasicBlocks::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(AssignExpr assign |
         bb.getNode(i).getNode().asAstNode() = assign and
         assign.getDest() = v.getAnAccess() and
@@ -99,7 +88,7 @@ module Ssa {
       )
     }
 
-    predicate variableRead(BasicBlock bb, int i, SourceVariable v, boolean certain) {
+    predicate variableRead(BasicBlocks::BasicBlock bb, int i, SourceVariable v, boolean certain) {
       exists(DeclRefExpr ref |
         not isLValue(ref) and
         bb.getNode(i).getNode().asAstNode() = ref and
@@ -133,7 +122,7 @@ module Ssa {
   /**
    * INTERNAL: Do not use.
    */
-  module SsaImpl = SsaImplCommon::Make<Location, SsaInput>;
+  module SsaImpl = SsaImplCommon::Make<Location, BasicBlocks::Cfg, SsaInput>;
 
   cached
   class Definition extends SsaImpl::Definition {
@@ -142,7 +131,7 @@ module Ssa {
 
     cached
     ControlFlowNode getARead() {
-      exists(SsaInput::SourceVariable v, SsaInput::BasicBlock bb, int i |
+      exists(SsaInput::SourceVariable v, BasicBlocks::BasicBlock bb, int i |
         SsaImpl::ssaDefReachesRead(v, this, bb, i) and
         SsaInput::variableRead(bb, i, v, true) and
         result = bb.getNode(i)
@@ -151,7 +140,7 @@ module Ssa {
 
     cached
     ControlFlowNode getAFirstRead() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(BasicBlocks::BasicBlock bb, int i |
         SsaImpl::firstUse(this, bb, i, true) and
         result = bb.getNode(i)
       )
@@ -160,7 +149,7 @@ module Ssa {
     cached
     predicate adjacentReadPair(ControlFlowNode read1, ControlFlowNode read2) {
       read1 = this.getARead() and
-      exists(SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2 |
+      exists(BasicBlocks::BasicBlock bb1, int i1, BasicBlocks::BasicBlock bb2, int i2 |
         read1 = bb1.getNode(i1) and
         SsaImpl::adjacentUseUse(bb1, i1, bb2, i2, _, true) and
         read2 = bb2.getNode(i2)
@@ -168,7 +157,7 @@ module Ssa {
     }
 
     cached
-    deprecated predicate lastRefRedef(SsaInput::BasicBlock bb, int i, Definition next) {
+    deprecated predicate lastRefRedef(BasicBlocks::BasicBlock bb, int i, Definition next) {
       SsaImpl::lastRefRedef(this, bb, i, next)
     }
   }
@@ -177,7 +166,7 @@ module Ssa {
   class WriteDefinition extends Definition, SsaImpl::WriteDefinition {
     cached
     override Location getLocation() {
-      exists(SsaInput::BasicBlock bb, int i |
+      exists(BasicBlocks::BasicBlock bb, int i |
         this.definesAt(_, bb, i) and
         result = bb.getNode(i).getLocation()
       )
@@ -189,19 +178,19 @@ module Ssa {
      */
     cached
     predicate assigns(CfgNode value) {
-      exists(AssignExpr a, SsaInput::BasicBlock bb, int i |
+      exists(AssignExpr a, BasicBlocks::BasicBlock bb, int i |
         this.definesAt(_, bb, i) and
         a = bb.getNode(i).getNode().asAstNode() and
         value.getNode().asAstNode() = a.getSource()
       )
       or
-      exists(SsaInput::BasicBlock bb, int blockIndex, NamedPattern np |
+      exists(BasicBlocks::BasicBlock bb, int blockIndex, NamedPattern np |
         this.definesAt(_, bb, blockIndex) and
         np = bb.getNode(blockIndex).getNode().asAstNode() and
         value.getNode().asAstNode() = np
       )
       or
-      exists(SsaInput::BasicBlock bb, int blockIndex, ConditionElement ce, Expr init |
+      exists(BasicBlocks::BasicBlock bb, int blockIndex, ConditionElement ce, Expr init |
         this.definesAt(_, bb, blockIndex) and
         ce.getPattern() = bb.getNode(blockIndex).getNode().asAstNode() and
         init = ce.getInitializer() and
@@ -216,14 +205,14 @@ module Ssa {
   class PhiDefinition extends Definition, SsaImpl::PhiNode {
     cached
     override Location getLocation() {
-      exists(SsaInput::BasicBlock bb |
+      exists(BasicBlocks::BasicBlock bb |
         this.definesAt(_, bb, _) and
         result = bb.getLocation()
       )
     }
 
     cached
-    Definition getPhiInput(SsaInput::BasicBlock bb) {
+    Definition getPhiInput(BasicBlocks::BasicBlock bb) {
       SsaImpl::phiHasInputFromBlock(this, result, bb)
     }
 
diff --git a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
index 18c837283baa..6b2a4581044b 100644
--- a/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
+++ b/swift/ql/lib/codeql/swift/dataflow/internal/DataFlowPrivate.qll
@@ -882,30 +882,11 @@ private predicate closureFlowStep(CaptureInput::Expr e1, CaptureInput::Expr e2)
   e2.(Pattern).getImmediateMatchingExpr() = e1
 }
 
-private module CaptureInput implements VariableCapture::InputSig<Location> {
+private module CaptureInput implements VariableCapture::InputSig<Location, BasicBlock> {
   private import swift as S
   private import codeql.swift.controlflow.ControlFlowGraph as Cfg
-  private import codeql.swift.controlflow.BasicBlocks as B
 
-  class BasicBlock instanceof B::BasicBlock {
-    string toString() { result = super.toString() }
-
-    ControlFlowNode getNode(int i) { result = super.getNode(i) }
-
-    int length() { result = super.length() }
-
-    Callable getEnclosingCallable() { result = super.getScope() }
-
-    Location getLocation() { result = super.getLocation() }
-  }
-
-  class ControlFlowNode = Cfg::ControlFlowNode;
-
-  BasicBlock getImmediateBasicBlockDominator(BasicBlock bb) {
-    result.(B::BasicBlock).immediatelyDominates(bb)
-  }
-
-  BasicBlock getABasicBlockSuccessor(BasicBlock bb) { result = bb.(B::BasicBlock).getASuccessor() }
+  Callable basicBlockGetEnclosingCallable(BasicBlock bb) { result = bb.getScope() }
 
   class CapturedVariable instanceof S::VarDecl {
     CapturedVariable() {
@@ -927,9 +908,7 @@ private module CaptureInput implements VariableCapture::InputSig<Location> {
 
     Location getLocation() { result = super.getLocation() }
 
-    predicate hasCfgNode(BasicBlock bb, int i) {
-      this = bb.(B::BasicBlock).getNode(i).getNode().asAstNode()
-    }
+    predicate hasCfgNode(BasicBlock bb, int i) { this = bb.getNode(i).getNode().asAstNode() }
   }
 
   class VariableWrite extends Expr {
@@ -1001,7 +980,7 @@ class CapturedVariable = CaptureInput::CapturedVariable;
 
 class CapturedParameter = CaptureInput::CapturedParameter;
 
-module CaptureFlow = VariableCapture::Flow<Location, CaptureInput>;
+module CaptureFlow = VariableCapture::Flow<Location, Cfg, CaptureInput>;
 
 private CaptureFlow::ClosureNode asClosureNode(Node n) {
   result = n.(CaptureNode).getSynthesizedCaptureNode()
diff --git a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
index 9eff4077f933..3410ae305194 100644
--- a/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
+++ b/swift/ql/lib/codeql/swift/elements/decl/internal/EnumDeclImpl.qll
@@ -7,7 +7,7 @@ module Impl {
   /**
    * An enumeration declaration, for example:
    * ```
-   * enum MyColours {
+   * enum MyColors {
    *   case red
    *   case green
    *   case blue
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 1adc383bd267..f85ca7dfc79c 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 5.0.5
+version: 5.0.6
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/lib/swift.qll b/swift/ql/lib/swift.qll
index 901d9e895e02..54f2abf90925 100644
--- a/swift/ql/lib/swift.qll
+++ b/swift/ql/lib/swift.qll
@@ -1,5 +1,6 @@
 /** Top-level import for the Swift language pack */
 
+import Customizations
 import codeql.swift.elements
 import codeql.swift.elements.expr.ArithmeticOperation
 import codeql.swift.elements.expr.Assignment
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index 8faa03573fc1..58d42ca78132 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.2.4
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
+
 ## 1.2.3
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.2.4.md b/swift/ql/src/change-notes/released/1.2.4.md
new file mode 100644
index 000000000000..cdd0409c4c3a
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.2.4.md
@@ -0,0 +1,5 @@
+## 1.2.4
+
+### Bug Fixes
+
+* Fixed an inconsistency across languages where most have a `Customizations.qll` file for adding customizations, but not all did.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 09a7400b5941..172090f46b6d 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.2.3
+lastReleaseVersion: 1.2.4
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index a6761f78190d..2923562dd2b2 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.2.3
+version: 1.2.4
 groups:
   - swift
   - queries